diff --git a/Dockerfile b/Dockerfile
index d24d5bb9..d16b4480 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # run container (dev): `docker run --name=brapi-test-server --network=bridge -p 8081:8081 -d docker-username/image-stack-name`
 # run container (prod): `docker run --name=brapi-test-server --restart always --network=brapi_net -d docker-username/image-stack-name`
 
-FROM adoptopenjdk/openjdk8
+FROM amazoncorretto:21
 
 # 8080 - brapi app port | 5005 - brapi app debug port | 8008 - keycloak app port
 EXPOSE 8080 5005 8008
diff --git a/README.md b/README.md
index cc25e6e6..4af2b57b 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@ Use [/calls](https://test-server.brapi.org/brapi/v1/call) (V1) or [/serverinfo](
 
 ## Prerequisites
 * Maven 3.9
-* Java 8
-* Postgres 13
+* Java 21
+* Postgres 17.2
 
 ## Auth Configuration
 BrAPI has provided a [sample central authentication service for the test server](https://brapi.org/oauth).
diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
index 661aa804..12412178 100644
--- a/docker-compose-dev.yaml
+++ b/docker-compose-dev.yaml
@@ -11,7 +11,7 @@ services:
     volumes:
       - .\src\main\resources\properties\application.properties:/home/brapi/properties/application.properties
   brapi-db:
-    image: postgres:13
+    image: postgres:17.2
     environment:
       POSTGRES_USER: brapi
       POSTGRES_PASSWORD: password
diff --git a/docker-compose-local-auth.yaml b/docker-compose-local-auth.yaml
index 11a74cf5..a387ac75 100644
--- a/docker-compose-local-auth.yaml
+++ b/docker-compose-local-auth.yaml
@@ -39,7 +39,7 @@ services:
     ports:
       - "8008:8008"
   brapi-db:
-    image: postgres:13
+    image: postgres:17.2
     environment:
       POSTGRES_USER: brapi
       POSTGRES_PASSWORD: password
@@ -48,7 +48,7 @@ services:
     ports:
       - "5433:5432"
   keycloak-db:
-    image: postgres:13
+    image: postgres:17.2
     volumes:
       - keycloak-data:/var/lib/postgresql/data
     environment:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 63d99609..b8ca3455 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -30,10 +30,10 @@ services:
       - KC_DB_USERNAME
       - KC_DB_PASSWORD
   postgres:
-    image: postgres:13
+    image: postgres:17.2
     volumes:
       # Update this path with the path your pipeline tool expects
-      - /home/jenkins/brapi.org/brapi-test-server/data:/var/lib/postgresql/data
+      - /home/jenkins/brapi.org/brapi-test-server/17-2:/var/lib/postgresql/data
 networks:
     default:
         external:
diff --git a/pom.xml b/pom.xml
index 6e32a3a2..962d101a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,18 +14,24 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring.version>2.5.12</spring.version>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<java.version>21</java.version>
+		<spring.version>3.4.0</spring.version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 		<springfox-version>2.10.0</springfox-version>
+		<slf4j-version>2.0.16</slf4j-version>
 	</properties>
 
 	<dependencies>
 		<dependency>
-		    <groupId>org.flywaydb</groupId>
-		    <artifactId>flyway-core</artifactId>
-		    <version>7.7.3</version>
+			<groupId>org.flywaydb</groupId>
+			<artifactId>flyway-core</artifactId>
+			<version>11.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.flywaydb</groupId>
+			<artifactId>flyway-database-postgresql</artifactId>
+			<version>11.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
@@ -58,6 +64,11 @@
 			<artifactId>spring-boot-starter-security</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt</artifactId>
@@ -100,6 +111,11 @@
 			<artifactId>jackson-datatype-threetenbp</artifactId>
 			<version>2.8.4</version>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>3.0.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -115,6 +131,16 @@
 			<artifactId>java-jwt</artifactId>
 			<version>3.14.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>${slf4j-version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -122,6 +148,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.4.1</version>
 				<configuration>
 					<archive>
 						<manifest>
diff --git a/src/main/java/io/swagger/api/core/CommonCropNamesApi.java b/src/main/java/io/swagger/api/core/CommonCropNamesApi.java
index 0c6f267f..7eaef81b 100644
--- a/src/main/java/io/swagger/api/core/CommonCropNamesApi.java
+++ b/src/main/java/io/swagger/api/core/CommonCropNamesApi.java
@@ -17,7 +17,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "commoncropnames", description = "the commoncropnames API")
 public interface CommonCropNamesApi {
 
diff --git a/src/main/java/io/swagger/api/core/ListsApi.java b/src/main/java/io/swagger/api/core/ListsApi.java
index 41b95a24..65756226 100644
--- a/src/main/java/io/swagger/api/core/ListsApi.java
+++ b/src/main/java/io/swagger/api/core/ListsApi.java
@@ -28,7 +28,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "lists", description = "the lists API")
 public interface ListsApi {
 
diff --git a/src/main/java/io/swagger/api/core/LocationsApi.java b/src/main/java/io/swagger/api/core/LocationsApi.java
index d824b9b6..6a99d65f 100644
--- a/src/main/java/io/swagger/api/core/LocationsApi.java
+++ b/src/main/java/io/swagger/api/core/LocationsApi.java
@@ -25,7 +25,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "locations", description = "the locations API")
 public interface LocationsApi {
 
diff --git a/src/main/java/io/swagger/api/core/PeopleApi.java b/src/main/java/io/swagger/api/core/PeopleApi.java
index d388b5b0..c3af7623 100644
--- a/src/main/java/io/swagger/api/core/PeopleApi.java
+++ b/src/main/java/io/swagger/api/core/PeopleApi.java
@@ -25,7 +25,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "people", description = "the people API")
 public interface PeopleApi {
 
diff --git a/src/main/java/io/swagger/api/core/ProgramsApi.java b/src/main/java/io/swagger/api/core/ProgramsApi.java
index e4b14da2..ebed60cc 100644
--- a/src/main/java/io/swagger/api/core/ProgramsApi.java
+++ b/src/main/java/io/swagger/api/core/ProgramsApi.java
@@ -26,7 +26,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "programs", description = "the programs API")
 public interface ProgramsApi {
 
diff --git a/src/main/java/io/swagger/api/core/SeasonsApi.java b/src/main/java/io/swagger/api/core/SeasonsApi.java
index 309ff053..0ad64e42 100644
--- a/src/main/java/io/swagger/api/core/SeasonsApi.java
+++ b/src/main/java/io/swagger/api/core/SeasonsApi.java
@@ -22,7 +22,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "seasons", description = "the seasons API")
 public interface SeasonsApi {
 
diff --git a/src/main/java/io/swagger/api/core/ServerInfoApi.java b/src/main/java/io/swagger/api/core/ServerInfoApi.java
index fa45bcd0..49fa3cd9 100644
--- a/src/main/java/io/swagger/api/core/ServerInfoApi.java
+++ b/src/main/java/io/swagger/api/core/ServerInfoApi.java
@@ -18,7 +18,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "serverinfo", description = "the serverinfo API")
 public interface ServerInfoApi {
 
diff --git a/src/main/java/io/swagger/api/core/StudiesApi.java b/src/main/java/io/swagger/api/core/StudiesApi.java
index 3a843f64..3ce2e3d7 100644
--- a/src/main/java/io/swagger/api/core/StudiesApi.java
+++ b/src/main/java/io/swagger/api/core/StudiesApi.java
@@ -25,7 +25,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "studies", description = "the studies API")
 public interface StudiesApi {
 
diff --git a/src/main/java/io/swagger/api/core/StudytypesApi.java b/src/main/java/io/swagger/api/core/StudytypesApi.java
index 8c58c364..d5f814f4 100644
--- a/src/main/java/io/swagger/api/core/StudytypesApi.java
+++ b/src/main/java/io/swagger/api/core/StudytypesApi.java
@@ -17,7 +17,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "studytypes", description = "the studytypes API")
 public interface StudytypesApi {
 
diff --git a/src/main/java/io/swagger/api/core/TrialsApi.java b/src/main/java/io/swagger/api/core/TrialsApi.java
index 80c377d2..d235d277 100644
--- a/src/main/java/io/swagger/api/core/TrialsApi.java
+++ b/src/main/java/io/swagger/api/core/TrialsApi.java
@@ -25,7 +25,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "trials", description = "the trials API")
 public interface TrialsApi {
 
diff --git a/src/main/java/io/swagger/api/geno/AlleleMatrixApi.java b/src/main/java/io/swagger/api/geno/AlleleMatrixApi.java
index 3150964e..1b0ed154 100644
--- a/src/main/java/io/swagger/api/geno/AlleleMatrixApi.java
+++ b/src/main/java/io/swagger/api/geno/AlleleMatrixApi.java
@@ -21,7 +21,7 @@
 import io.swagger.model.geno.AlleleMatrixSearchRequest;
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-17T15:45:22.167Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-17T15:45:22.167Z[GMT]")
 @Validated
 public interface AlleleMatrixApi {
 
diff --git a/src/main/java/io/swagger/api/geno/CallSetsApi.java b/src/main/java/io/swagger/api/geno/CallSetsApi.java
index 64c1e17c..16fa042c 100644
--- a/src/main/java/io/swagger/api/geno/CallSetsApi.java
+++ b/src/main/java/io/swagger/api/geno/CallSetsApi.java
@@ -24,7 +24,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "callsets", description = "the callsets API")
 public interface CallSetsApi {
 
diff --git a/src/main/java/io/swagger/api/geno/CallsApi.java b/src/main/java/io/swagger/api/geno/CallsApi.java
index 452b888c..e48d250c 100644
--- a/src/main/java/io/swagger/api/geno/CallsApi.java
+++ b/src/main/java/io/swagger/api/geno/CallsApi.java
@@ -25,7 +25,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "calls", description = "the calls API")
 public interface CallsApi {
 
diff --git a/src/main/java/io/swagger/api/geno/MapsApi.java b/src/main/java/io/swagger/api/geno/MapsApi.java
index b40fd57c..265f7b84 100644
--- a/src/main/java/io/swagger/api/geno/MapsApi.java
+++ b/src/main/java/io/swagger/api/geno/MapsApi.java
@@ -20,7 +20,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "maps", description = "the maps API")
 public interface MapsApi {
 
diff --git a/src/main/java/io/swagger/api/geno/MarkerPositionsApi.java b/src/main/java/io/swagger/api/geno/MarkerPositionsApi.java
index b5f09c8f..d54bbc06 100644
--- a/src/main/java/io/swagger/api/geno/MarkerPositionsApi.java
+++ b/src/main/java/io/swagger/api/geno/MarkerPositionsApi.java
@@ -22,7 +22,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "markerpositions", description = "the markerpositions API")
 public interface MarkerPositionsApi {
 
diff --git a/src/main/java/io/swagger/api/geno/PlatesApi.java b/src/main/java/io/swagger/api/geno/PlatesApi.java
index c1f5b2c3..8a8f2d7a 100644
--- a/src/main/java/io/swagger/api/geno/PlatesApi.java
+++ b/src/main/java/io/swagger/api/geno/PlatesApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-02T18:30:00.206Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-02T18:30:00.206Z[GMT]")
 @Validated
 public interface PlatesApi {
 
diff --git a/src/main/java/io/swagger/api/geno/ReferenceSetsApi.java b/src/main/java/io/swagger/api/geno/ReferenceSetsApi.java
index 170d7fd6..6ac59d03 100644
--- a/src/main/java/io/swagger/api/geno/ReferenceSetsApi.java
+++ b/src/main/java/io/swagger/api/geno/ReferenceSetsApi.java
@@ -23,7 +23,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "referencesets", description = "the referencesets API")
 public interface ReferenceSetsApi {
 
diff --git a/src/main/java/io/swagger/api/geno/ReferencesApi.java b/src/main/java/io/swagger/api/geno/ReferencesApi.java
index 1e9cfc85..3cc4688e 100644
--- a/src/main/java/io/swagger/api/geno/ReferencesApi.java
+++ b/src/main/java/io/swagger/api/geno/ReferencesApi.java
@@ -24,7 +24,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "references", description = "the references API")
 public interface ReferencesApi {
 
diff --git a/src/main/java/io/swagger/api/geno/SamplesApi.java b/src/main/java/io/swagger/api/geno/SamplesApi.java
index 9da53017..63233269 100644
--- a/src/main/java/io/swagger/api/geno/SamplesApi.java
+++ b/src/main/java/io/swagger/api/geno/SamplesApi.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "samples", description = "the samples API")
 public interface SamplesApi {
 
diff --git a/src/main/java/io/swagger/api/geno/VariantSetsApi.java b/src/main/java/io/swagger/api/geno/VariantSetsApi.java
index 2ed0bbb5..9db6ffed 100644
--- a/src/main/java/io/swagger/api/geno/VariantSetsApi.java
+++ b/src/main/java/io/swagger/api/geno/VariantSetsApi.java
@@ -27,7 +27,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "variantsets", description = "the variantsets API")
 public interface VariantSetsApi {
 
diff --git a/src/main/java/io/swagger/api/geno/VariantsApi.java b/src/main/java/io/swagger/api/geno/VariantsApi.java
index 732c0b21..bab36567 100644
--- a/src/main/java/io/swagger/api/geno/VariantsApi.java
+++ b/src/main/java/io/swagger/api/geno/VariantsApi.java
@@ -24,7 +24,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "variants", description = "the variants API")
 public interface VariantsApi {
 
diff --git a/src/main/java/io/swagger/api/geno/VendorApi.java b/src/main/java/io/swagger/api/geno/VendorApi.java
index 313db544..c872323d 100644
--- a/src/main/java/io/swagger/api/geno/VendorApi.java
+++ b/src/main/java/io/swagger/api/geno/VendorApi.java
@@ -28,7 +28,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "vendor", description = "the vendor API")
 public interface VendorApi {
 
diff --git a/src/main/java/io/swagger/api/germ/AttributeValuesApi.java b/src/main/java/io/swagger/api/germ/AttributeValuesApi.java
index 719731f4..aa0c6cba 100644
--- a/src/main/java/io/swagger/api/germ/AttributeValuesApi.java
+++ b/src/main/java/io/swagger/api/germ/AttributeValuesApi.java
@@ -25,7 +25,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "attributevalues", description = "the attributevalues API")
 public interface AttributeValuesApi {
 
diff --git a/src/main/java/io/swagger/api/germ/AttributesApi.java b/src/main/java/io/swagger/api/germ/AttributesApi.java
index 41a1d369..381384f1 100644
--- a/src/main/java/io/swagger/api/germ/AttributesApi.java
+++ b/src/main/java/io/swagger/api/germ/AttributesApi.java
@@ -26,7 +26,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "attributes", description = "the attributes API")
 public interface AttributesApi {
 
diff --git a/src/main/java/io/swagger/api/germ/BreedingMethodsApi.java b/src/main/java/io/swagger/api/germ/BreedingMethodsApi.java
index 6c6c60f3..a8c0e78d 100644
--- a/src/main/java/io/swagger/api/germ/BreedingMethodsApi.java
+++ b/src/main/java/io/swagger/api/germ/BreedingMethodsApi.java
@@ -19,7 +19,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "breedingmethods", description = "the breedingmethods API")
 public interface BreedingMethodsApi {
 
diff --git a/src/main/java/io/swagger/api/germ/CrossesApi.java b/src/main/java/io/swagger/api/germ/CrossesApi.java
index 3a6bdb0b..d527694c 100644
--- a/src/main/java/io/swagger/api/germ/CrossesApi.java
+++ b/src/main/java/io/swagger/api/germ/CrossesApi.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "crosses", description = "the crosses API")
 public interface CrossesApi {
 
diff --git a/src/main/java/io/swagger/api/germ/CrossingProjectsApi.java b/src/main/java/io/swagger/api/germ/CrossingProjectsApi.java
index 028486b2..d98a417d 100644
--- a/src/main/java/io/swagger/api/germ/CrossingProjectsApi.java
+++ b/src/main/java/io/swagger/api/germ/CrossingProjectsApi.java
@@ -22,7 +22,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "crossingprojects", description = "the crossingprojects API")
 public interface CrossingProjectsApi {
 
diff --git a/src/main/java/io/swagger/api/germ/GermplasmApi.java b/src/main/java/io/swagger/api/germ/GermplasmApi.java
index b5a9518e..444520a7 100644
--- a/src/main/java/io/swagger/api/germ/GermplasmApi.java
+++ b/src/main/java/io/swagger/api/germ/GermplasmApi.java
@@ -28,7 +28,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "germplasm", description = "the germplasm API")
 public interface GermplasmApi {
 
diff --git a/src/main/java/io/swagger/api/germ/PedigreeApi.java b/src/main/java/io/swagger/api/germ/PedigreeApi.java
index 49c89ae9..e9af992a 100644
--- a/src/main/java/io/swagger/api/germ/PedigreeApi.java
+++ b/src/main/java/io/swagger/api/germ/PedigreeApi.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-03T22:50:47.807Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-03T22:50:47.807Z[GMT]")
 @Validated
 public interface PedigreeApi {
 
diff --git a/src/main/java/io/swagger/api/germ/PlannedCrossesApi.java b/src/main/java/io/swagger/api/germ/PlannedCrossesApi.java
index c85241b9..cdc1d717 100644
--- a/src/main/java/io/swagger/api/germ/PlannedCrossesApi.java
+++ b/src/main/java/io/swagger/api/germ/PlannedCrossesApi.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "plannedcrosses", description = "the plannedcrosses API")
 public interface PlannedCrossesApi {
 
diff --git a/src/main/java/io/swagger/api/germ/SeedLotsApi.java b/src/main/java/io/swagger/api/germ/SeedLotsApi.java
index 8b0f950a..cfd3496d 100644
--- a/src/main/java/io/swagger/api/germ/SeedLotsApi.java
+++ b/src/main/java/io/swagger/api/germ/SeedLotsApi.java
@@ -24,7 +24,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "seedlots", description = "the seedlots API")
 public interface SeedLotsApi {
 
diff --git a/src/main/java/io/swagger/api/pheno/EventsApi.java b/src/main/java/io/swagger/api/pheno/EventsApi.java
index 6d18f11f..70311e5e 100644
--- a/src/main/java/io/swagger/api/pheno/EventsApi.java
+++ b/src/main/java/io/swagger/api/pheno/EventsApi.java
@@ -17,7 +17,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Api(value = "events", description = "the events API")
 public interface EventsApi {
 
diff --git a/src/main/java/io/swagger/api/pheno/ImagesApi.java b/src/main/java/io/swagger/api/pheno/ImagesApi.java
index 924e3802..9c3cf2e1 100644
--- a/src/main/java/io/swagger/api/pheno/ImagesApi.java
+++ b/src/main/java/io/swagger/api/pheno/ImagesApi.java
@@ -26,7 +26,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Api(value = "images", description = "the images API")
 public interface ImagesApi {
 
diff --git a/src/main/java/io/swagger/api/pheno/MethodsApi.java b/src/main/java/io/swagger/api/pheno/MethodsApi.java
index 2ae666fd..ada24740 100644
--- a/src/main/java/io/swagger/api/pheno/MethodsApi.java
+++ b/src/main/java/io/swagger/api/pheno/MethodsApi.java
@@ -22,7 +22,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Api(value = "methods", description = "the methods API")
 public interface MethodsApi {
 
diff --git a/src/main/java/io/swagger/api/pheno/ObservationLevelsApi.java b/src/main/java/io/swagger/api/pheno/ObservationLevelsApi.java
index 76a9ddaf..b1ffd905 100644
--- a/src/main/java/io/swagger/api/pheno/ObservationLevelsApi.java
+++ b/src/main/java/io/swagger/api/pheno/ObservationLevelsApi.java
@@ -17,7 +17,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Api(value = "observationlevels", description = "the observationlevels API")
 public interface ObservationLevelsApi {
 
diff --git a/src/main/java/io/swagger/api/pheno/ObservationUnitsApi.java b/src/main/java/io/swagger/api/pheno/ObservationUnitsApi.java
index ccfcaaa8..1994fdef 100644
--- a/src/main/java/io/swagger/api/pheno/ObservationUnitsApi.java
+++ b/src/main/java/io/swagger/api/pheno/ObservationUnitsApi.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Api(value = "observationunits", description = "the observationunits API")
 public interface ObservationUnitsApi {
 
diff --git a/src/main/java/io/swagger/api/pheno/ObservationsApi.java b/src/main/java/io/swagger/api/pheno/ObservationsApi.java
index 0bac6acd..c8c9019e 100644
--- a/src/main/java/io/swagger/api/pheno/ObservationsApi.java
+++ b/src/main/java/io/swagger/api/pheno/ObservationsApi.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Api(value = "observations", description = "the observations API")
 public interface ObservationsApi {
 
diff --git a/src/main/java/io/swagger/api/pheno/OntologiesApi.java b/src/main/java/io/swagger/api/pheno/OntologiesApi.java
index 8d248c5e..e09c9ddd 100644
--- a/src/main/java/io/swagger/api/pheno/OntologiesApi.java
+++ b/src/main/java/io/swagger/api/pheno/OntologiesApi.java
@@ -12,7 +12,7 @@
 
 import java.util.List;
 
-import javax.websocket.server.PathParam;
+import jakarta.websocket.server.PathParam;
 
 import org.brapi.test.BrAPITestServer.exceptions.BrAPIServerException;
 import org.springframework.http.ResponseEntity;
@@ -24,7 +24,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Api(value = "ontologies", description = "the ontologies API")
 public interface OntologiesApi {
 
diff --git a/src/main/java/io/swagger/api/pheno/ScalesApi.java b/src/main/java/io/swagger/api/pheno/ScalesApi.java
index 2a12e511..74838440 100644
--- a/src/main/java/io/swagger/api/pheno/ScalesApi.java
+++ b/src/main/java/io/swagger/api/pheno/ScalesApi.java
@@ -22,7 +22,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Api(value = "scales", description = "the scales API")
 public interface ScalesApi {
 
diff --git a/src/main/java/io/swagger/api/pheno/TraitsApi.java b/src/main/java/io/swagger/api/pheno/TraitsApi.java
index 18d1720c..ec609dd5 100644
--- a/src/main/java/io/swagger/api/pheno/TraitsApi.java
+++ b/src/main/java/io/swagger/api/pheno/TraitsApi.java
@@ -22,7 +22,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Api(value = "traits", description = "the traits API")
 public interface TraitsApi {
 
diff --git a/src/main/java/io/swagger/api/pheno/VariablesApi.java b/src/main/java/io/swagger/api/pheno/VariablesApi.java
index 09e48701..8e46f896 100644
--- a/src/main/java/io/swagger/api/pheno/VariablesApi.java
+++ b/src/main/java/io/swagger/api/pheno/VariablesApi.java
@@ -25,7 +25,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Api(value = "variables", description = "the variables API")
 public interface VariablesApi {
 
diff --git a/src/main/java/io/swagger/model/Context.java b/src/main/java/io/swagger/model/Context.java
index e833e56c..720ac25d 100644
--- a/src/main/java/io/swagger/model/Context.java
+++ b/src/main/java/io/swagger/model/Context.java
@@ -15,7 +15,7 @@
  */
 @ApiModel(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")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Context extends ArrayList<String> {
 	private static final long serialVersionUID = 6638807737898652599L;
 
diff --git a/src/main/java/io/swagger/model/DataFile.java b/src/main/java/io/swagger/model/DataFile.java
index fa95b325..a1b9301a 100644
--- a/src/main/java/io/swagger/model/DataFile.java
+++ b/src/main/java/io/swagger/model/DataFile.java
@@ -12,7 +12,7 @@
  */
 @ApiModel(description = "A dataFile contains a URL and the relevant file metadata to represent a file")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class DataFile   {
   @JsonProperty("fileDescription")
   private String fileDescription = null;
diff --git a/src/main/java/io/swagger/model/DataLink.java b/src/main/java/io/swagger/model/DataLink.java
index 7d3678d5..382a13b4 100644
--- a/src/main/java/io/swagger/model/DataLink.java
+++ b/src/main/java/io/swagger/model/DataLink.java
@@ -11,7 +11,7 @@
  * DataLink
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class DataLink   {
   @JsonProperty("dataFormat")
   private String dataFormat = null;
diff --git a/src/main/java/io/swagger/model/ExternalReferences.java b/src/main/java/io/swagger/model/ExternalReferences.java
index 7d538190..d460806d 100644
--- a/src/main/java/io/swagger/model/ExternalReferences.java
+++ b/src/main/java/io/swagger/model/ExternalReferences.java
@@ -14,7 +14,7 @@
  */
 @ApiModel(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.")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ExternalReferences extends ArrayList<ExternalReferencesInner> {
 
 	private static final long serialVersionUID = -4795437173672218910L;
diff --git a/src/main/java/io/swagger/model/GeoJSON.java b/src/main/java/io/swagger/model/GeoJSON.java
index ee62b9f0..7738ab47 100644
--- a/src/main/java/io/swagger/model/GeoJSON.java
+++ b/src/main/java/io/swagger/model/GeoJSON.java
@@ -12,7 +12,7 @@
  */
 @ApiModel(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.")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class GeoJSON   {
   @JsonProperty("geometry")
   private GeoJSONGeometry geometry = null;
diff --git a/src/main/java/io/swagger/model/GeoJSONSearchArea.java b/src/main/java/io/swagger/model/GeoJSONSearchArea.java
index 5a1fea1e..6e6e4877 100644
--- a/src/main/java/io/swagger/model/GeoJSONSearchArea.java
+++ b/src/main/java/io/swagger/model/GeoJSONSearchArea.java
@@ -10,7 +10,7 @@
  * GeoJSONSearchArea
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class GeoJSONSearchArea extends GeoJSON  {
 
   @Override
diff --git a/src/main/java/io/swagger/model/IndexPagination.java b/src/main/java/io/swagger/model/IndexPagination.java
index 5c2908c2..92657c2b 100644
--- a/src/main/java/io/swagger/model/IndexPagination.java
+++ b/src/main/java/io/swagger/model/IndexPagination.java
@@ -12,7 +12,7 @@
  * IndexPagination
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class IndexPagination extends Pagination {
 	@JsonProperty("currentPage")
 	private Integer currentPage = 0;
diff --git a/src/main/java/io/swagger/model/LinearRing.java b/src/main/java/io/swagger/model/LinearRing.java
index fc4a4acd..bf344e0b 100644
--- a/src/main/java/io/swagger/model/LinearRing.java
+++ b/src/main/java/io/swagger/model/LinearRing.java
@@ -13,7 +13,7 @@
  */
 @ApiModel(description = "An array of at least four positions where the first equals the last")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class LinearRing extends ArrayList<Position> {
 	private static final long serialVersionUID = 7354489886197117499L;
 
diff --git a/src/main/java/io/swagger/model/Metadata.java b/src/main/java/io/swagger/model/Metadata.java
index 131356ad..747de20a 100644
--- a/src/main/java/io/swagger/model/Metadata.java
+++ b/src/main/java/io/swagger/model/Metadata.java
@@ -14,7 +14,7 @@
  * Metadata
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Metadata {
 	@JsonProperty("datafiles")
 	@Valid
diff --git a/src/main/java/io/swagger/model/Model202AcceptedSearchResponse.java b/src/main/java/io/swagger/model/Model202AcceptedSearchResponse.java
index 4559b25b..f65f2ccb 100644
--- a/src/main/java/io/swagger/model/Model202AcceptedSearchResponse.java
+++ b/src/main/java/io/swagger/model/Model202AcceptedSearchResponse.java
@@ -17,7 +17,7 @@
  * Model202AcceptedSearchResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Model202AcceptedSearchResponse implements BrAPIResponse<Model202AcceptedSearchResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/Model202AcceptedSearchResponseResult.java b/src/main/java/io/swagger/model/Model202AcceptedSearchResponseResult.java
index fba1a316..f62920ef 100644
--- a/src/main/java/io/swagger/model/Model202AcceptedSearchResponseResult.java
+++ b/src/main/java/io/swagger/model/Model202AcceptedSearchResponseResult.java
@@ -11,7 +11,7 @@
  * Model202AcceptedSearchResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Model202AcceptedSearchResponseResult   {
   @JsonProperty("searchResultsDbId")
   private String searchResultsDbId = null;
diff --git a/src/main/java/io/swagger/model/OntologyReference.java b/src/main/java/io/swagger/model/OntologyReference.java
index 0d015a11..eba38e6c 100644
--- a/src/main/java/io/swagger/model/OntologyReference.java
+++ b/src/main/java/io/swagger/model/OntologyReference.java
@@ -17,7 +17,7 @@
  */
 @ApiModel(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).")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class OntologyReference   {
   @JsonProperty("documentationLinks")
   @Valid
diff --git a/src/main/java/io/swagger/model/OntologyReferenceDocumentationLinks.java b/src/main/java/io/swagger/model/OntologyReferenceDocumentationLinks.java
index 4f7f9c2a..a0b25a24 100644
--- a/src/main/java/io/swagger/model/OntologyReferenceDocumentationLinks.java
+++ b/src/main/java/io/swagger/model/OntologyReferenceDocumentationLinks.java
@@ -11,7 +11,7 @@
  * OntologyReferenceDocumentationLinks
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class OntologyReferenceDocumentationLinks   {
   @JsonProperty("URL")
   private String URL = null;
diff --git a/src/main/java/io/swagger/model/OntologyReferenceTypeEnum.java b/src/main/java/io/swagger/model/OntologyReferenceTypeEnum.java
index e02e2f12..6b52a7fe 100644
--- a/src/main/java/io/swagger/model/OntologyReferenceTypeEnum.java
+++ b/src/main/java/io/swagger/model/OntologyReferenceTypeEnum.java
@@ -7,8 +7,7 @@ public enum OntologyReferenceTypeEnum {
     OBO("OBO"),
     RDF("RDF"),
     WEBPAGE("WEBPAGE");
-
-    private String value;
+private String value;
 
     OntologyReferenceTypeEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/Pagination.java b/src/main/java/io/swagger/model/Pagination.java
index bbb6cf8b..eae44e1f 100644
--- a/src/main/java/io/swagger/model/Pagination.java
+++ b/src/main/java/io/swagger/model/Pagination.java
@@ -10,7 +10,7 @@
  * BasePagination
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public abstract class Pagination {
 	@JsonProperty("pageSize")
 	protected Integer pageSize = 1000;
diff --git a/src/main/java/io/swagger/model/PointGeometry.java b/src/main/java/io/swagger/model/PointGeometry.java
index 6a2703eb..4c20312f 100644
--- a/src/main/java/io/swagger/model/PointGeometry.java
+++ b/src/main/java/io/swagger/model/PointGeometry.java
@@ -19,7 +19,7 @@
  */
 @ApiModel(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.")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @JsonDeserialize(as = PointGeometry.class)
 public class PointGeometry implements GeoJSONGeometry {
 	@JsonProperty("coordinates")
diff --git a/src/main/java/io/swagger/model/Polygon.java b/src/main/java/io/swagger/model/Polygon.java
index e3f11e9f..a8ab218e 100644
--- a/src/main/java/io/swagger/model/Polygon.java
+++ b/src/main/java/io/swagger/model/Polygon.java
@@ -13,7 +13,7 @@
  */
 @ApiModel(description = "An array of linear rings")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Polygon extends ArrayList<LinearRing> {
 	private static final long serialVersionUID = 2624081902740191621L;
 
diff --git a/src/main/java/io/swagger/model/PolygonGeometry.java b/src/main/java/io/swagger/model/PolygonGeometry.java
index a3fd7b00..94e3e8fa 100644
--- a/src/main/java/io/swagger/model/PolygonGeometry.java
+++ b/src/main/java/io/swagger/model/PolygonGeometry.java
@@ -20,7 +20,7 @@
  */
 @ApiModel(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.")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @JsonDeserialize(as = PolygonGeometry.class)
 public class PolygonGeometry implements GeoJSONGeometry {
 	@JsonProperty("coordinates")
diff --git a/src/main/java/io/swagger/model/Position.java b/src/main/java/io/swagger/model/Position.java
index 2c5c7fe4..3f782e49 100644
--- a/src/main/java/io/swagger/model/Position.java
+++ b/src/main/java/io/swagger/model/Position.java
@@ -13,7 +13,7 @@
  */
 @ApiModel(description = "A single position")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Position extends ArrayList<BigDecimal> {
 	private static final long serialVersionUID = -3846635942332609326L;
 
diff --git a/src/main/java/io/swagger/model/SearchRequestParametersTokenPaging.java b/src/main/java/io/swagger/model/SearchRequestParametersTokenPaging.java
index e165609d..97beff0f 100644
--- a/src/main/java/io/swagger/model/SearchRequestParametersTokenPaging.java
+++ b/src/main/java/io/swagger/model/SearchRequestParametersTokenPaging.java
@@ -11,7 +11,7 @@
  * SearchRequestParametersTokenPaging
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class SearchRequestParametersTokenPaging   {
   @JsonProperty("pageSize")
   private Integer pageSize = null;
diff --git a/src/main/java/io/swagger/model/Status.java b/src/main/java/io/swagger/model/Status.java
index 6717cb21..770a7a17 100644
--- a/src/main/java/io/swagger/model/Status.java
+++ b/src/main/java/io/swagger/model/Status.java
@@ -16,7 +16,7 @@
  */
 @ApiModel(description = "An array of status messages to convey technical logging information from the server to the client.")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Status   {
   @JsonProperty("message")
   private String message = null;
@@ -32,8 +32,7 @@ public enum MessageTypeEnum {
     WARNING("WARNING"),
     
     INFO("INFO");
-
-    private String value;
+private String value;
 
     MessageTypeEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/TokenPagination.java b/src/main/java/io/swagger/model/TokenPagination.java
index ffbac3c1..ca563ba5 100644
--- a/src/main/java/io/swagger/model/TokenPagination.java
+++ b/src/main/java/io/swagger/model/TokenPagination.java
@@ -12,7 +12,7 @@
  * TokenPagination
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class TokenPagination extends Pagination {
 	@JsonProperty("currentPageToken")
 	private String currentPageToken = null;
diff --git a/src/main/java/io/swagger/model/core/CommonCropNamesResponse.java b/src/main/java/io/swagger/model/core/CommonCropNamesResponse.java
index 13eaabfd..8de0b9ec 100644
--- a/src/main/java/io/swagger/model/core/CommonCropNamesResponse.java
+++ b/src/main/java/io/swagger/model/core/CommonCropNamesResponse.java
@@ -14,7 +14,7 @@
  * CommonCropNamesResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class CommonCropNamesResponse implements BrAPIResponse<CommonCropNamesResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/CommonCropNamesResponseResult.java b/src/main/java/io/swagger/model/core/CommonCropNamesResponseResult.java
index cef54b6c..d0707048 100644
--- a/src/main/java/io/swagger/model/core/CommonCropNamesResponseResult.java
+++ b/src/main/java/io/swagger/model/core/CommonCropNamesResponseResult.java
@@ -14,7 +14,7 @@
  * CommonCropNamesResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class CommonCropNamesResponseResult implements BrAPIResponseResult<String>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/Contact.java b/src/main/java/io/swagger/model/core/Contact.java
index 133edbe4..8c9d0110 100644
--- a/src/main/java/io/swagger/model/core/Contact.java
+++ b/src/main/java/io/swagger/model/core/Contact.java
@@ -9,7 +9,7 @@
  * Contact
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Contact   {
   @JsonProperty("contactDbId")
   private String contactDbId = null;
diff --git a/src/main/java/io/swagger/model/core/EnvironmentParameter.java b/src/main/java/io/swagger/model/core/EnvironmentParameter.java
index 72f7c206..f26b3ba1 100644
--- a/src/main/java/io/swagger/model/core/EnvironmentParameter.java
+++ b/src/main/java/io/swagger/model/core/EnvironmentParameter.java
@@ -9,7 +9,7 @@
  * EnvironmentParameter
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class EnvironmentParameter   {
   @JsonProperty("description")
   private String description = null;
diff --git a/src/main/java/io/swagger/model/core/ListBaseFields.java b/src/main/java/io/swagger/model/core/ListBaseFields.java
index b4e37961..a831d4e0 100644
--- a/src/main/java/io/swagger/model/core/ListBaseFields.java
+++ b/src/main/java/io/swagger/model/core/ListBaseFields.java
@@ -15,7 +15,7 @@
  * ListBaseFields
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ListBaseFields implements ListBaseFieldsInterface  {
   @JsonProperty("additionalInfo")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/ListDetails.java b/src/main/java/io/swagger/model/core/ListDetails.java
index af19cb8d..ba4d21be 100644
--- a/src/main/java/io/swagger/model/core/ListDetails.java
+++ b/src/main/java/io/swagger/model/core/ListDetails.java
@@ -14,7 +14,7 @@
  * ListDetails
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ListDetails extends ListSummary implements BrAPIResponseResult<String> {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/ListNewRequest.java b/src/main/java/io/swagger/model/core/ListNewRequest.java
index ff018959..9765fe81 100644
--- a/src/main/java/io/swagger/model/core/ListNewRequest.java
+++ b/src/main/java/io/swagger/model/core/ListNewRequest.java
@@ -12,7 +12,7 @@
  * ListNewRequest
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ListNewRequest extends ListBaseFields  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/ListResponse.java b/src/main/java/io/swagger/model/core/ListResponse.java
index 5c20a592..75aa81e4 100644
--- a/src/main/java/io/swagger/model/core/ListResponse.java
+++ b/src/main/java/io/swagger/model/core/ListResponse.java
@@ -14,7 +14,7 @@
  * ListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ListResponse implements BrAPIResponse<ListDetails> {
 	@JsonProperty("@context")
 	private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/ListSummary.java b/src/main/java/io/swagger/model/core/ListSummary.java
index b08d0a29..250575df 100644
--- a/src/main/java/io/swagger/model/core/ListSummary.java
+++ b/src/main/java/io/swagger/model/core/ListSummary.java
@@ -9,7 +9,7 @@
  * ListSummary
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ListSummary extends ListBaseFields  {
   @JsonProperty("listDbId")
   private String listDbId = null;
diff --git a/src/main/java/io/swagger/model/core/ListsListResponse.java b/src/main/java/io/swagger/model/core/ListsListResponse.java
index c27782f2..7515eef8 100644
--- a/src/main/java/io/swagger/model/core/ListsListResponse.java
+++ b/src/main/java/io/swagger/model/core/ListsListResponse.java
@@ -14,7 +14,7 @@
  * ListsListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ListsListResponse implements BrAPIResponse<ListsListResponseResult> {
 	@JsonProperty("@context")
 	private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/ListsListResponseResult.java b/src/main/java/io/swagger/model/core/ListsListResponseResult.java
index 57821c40..e769c95d 100644
--- a/src/main/java/io/swagger/model/core/ListsListResponseResult.java
+++ b/src/main/java/io/swagger/model/core/ListsListResponseResult.java
@@ -14,7 +14,7 @@
  * ListsListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ListsListResponseResult implements BrAPIResponseResult<ListSummary>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/LocationListResponse.java b/src/main/java/io/swagger/model/core/LocationListResponse.java
index a8fe78bf..70c07aff 100644
--- a/src/main/java/io/swagger/model/core/LocationListResponse.java
+++ b/src/main/java/io/swagger/model/core/LocationListResponse.java
@@ -14,7 +14,7 @@
  * LocationListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class LocationListResponse implements BrAPIResponse<LocationListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/LocationListResponseResult.java b/src/main/java/io/swagger/model/core/LocationListResponseResult.java
index b2b623c3..c27682f5 100644
--- a/src/main/java/io/swagger/model/core/LocationListResponseResult.java
+++ b/src/main/java/io/swagger/model/core/LocationListResponseResult.java
@@ -14,7 +14,7 @@
  * LocationListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class LocationListResponseResult implements BrAPIResponseResult<Location>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/LocationSingleResponse.java b/src/main/java/io/swagger/model/core/LocationSingleResponse.java
index bf8f50fd..5f1b8823 100644
--- a/src/main/java/io/swagger/model/core/LocationSingleResponse.java
+++ b/src/main/java/io/swagger/model/core/LocationSingleResponse.java
@@ -16,7 +16,7 @@
  * LocationSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class LocationSingleResponse implements BrAPIResponse<Location>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/Person.java b/src/main/java/io/swagger/model/core/Person.java
index 8f3fbb07..f671e301 100644
--- a/src/main/java/io/swagger/model/core/Person.java
+++ b/src/main/java/io/swagger/model/core/Person.java
@@ -11,7 +11,7 @@
  * Person
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Person extends PersonNewRequest  {
   @JsonProperty("personDbId")
   private String personDbId = null;
diff --git a/src/main/java/io/swagger/model/core/PersonListResponse.java b/src/main/java/io/swagger/model/core/PersonListResponse.java
index ea4cf278..29ceece5 100644
--- a/src/main/java/io/swagger/model/core/PersonListResponse.java
+++ b/src/main/java/io/swagger/model/core/PersonListResponse.java
@@ -16,7 +16,7 @@
  * PersonListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class PersonListResponse implements BrAPIResponse<PersonListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/PersonListResponseResult.java b/src/main/java/io/swagger/model/core/PersonListResponseResult.java
index 9be43ebe..c905d67b 100644
--- a/src/main/java/io/swagger/model/core/PersonListResponseResult.java
+++ b/src/main/java/io/swagger/model/core/PersonListResponseResult.java
@@ -16,7 +16,7 @@
  * PersonListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class PersonListResponseResult implements BrAPIResponseResult<Person>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/PersonNewRequest.java b/src/main/java/io/swagger/model/core/PersonNewRequest.java
index e7cf8258..79ba5abb 100644
--- a/src/main/java/io/swagger/model/core/PersonNewRequest.java
+++ b/src/main/java/io/swagger/model/core/PersonNewRequest.java
@@ -16,7 +16,7 @@
  * PersonNewRequest
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class PersonNewRequest   {
   @JsonProperty("additionalInfo")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/PersonSingleResponse.java b/src/main/java/io/swagger/model/core/PersonSingleResponse.java
index 7ff7eadd..3f3c5b3d 100644
--- a/src/main/java/io/swagger/model/core/PersonSingleResponse.java
+++ b/src/main/java/io/swagger/model/core/PersonSingleResponse.java
@@ -16,7 +16,7 @@
  * PersonSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class PersonSingleResponse implements BrAPIResponse<Person>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/ProgramListResponse.java b/src/main/java/io/swagger/model/core/ProgramListResponse.java
index 640421f0..08101d74 100644
--- a/src/main/java/io/swagger/model/core/ProgramListResponse.java
+++ b/src/main/java/io/swagger/model/core/ProgramListResponse.java
@@ -16,7 +16,7 @@
  * ProgramListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ProgramListResponse implements BrAPIResponse<ProgramListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/ProgramListResponseResult.java b/src/main/java/io/swagger/model/core/ProgramListResponseResult.java
index 84ca4497..688a6ece 100644
--- a/src/main/java/io/swagger/model/core/ProgramListResponseResult.java
+++ b/src/main/java/io/swagger/model/core/ProgramListResponseResult.java
@@ -16,7 +16,7 @@
  * ProgramListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ProgramListResponseResult implements BrAPIResponseResult<Program>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/ProgramSingleResponse.java b/src/main/java/io/swagger/model/core/ProgramSingleResponse.java
index 5b9df60c..7389409a 100644
--- a/src/main/java/io/swagger/model/core/ProgramSingleResponse.java
+++ b/src/main/java/io/swagger/model/core/ProgramSingleResponse.java
@@ -16,7 +16,7 @@
  * ProgramSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ProgramSingleResponse implements BrAPIResponse<Program>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/Season.java b/src/main/java/io/swagger/model/core/Season.java
index ec1a9145..9f42cf43 100644
--- a/src/main/java/io/swagger/model/core/Season.java
+++ b/src/main/java/io/swagger/model/core/Season.java
@@ -11,7 +11,7 @@
  * Season
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Season   {
   @JsonProperty("seasonDbId")
   private String seasonDbId = null;
diff --git a/src/main/java/io/swagger/model/core/SeasonListResponse.java b/src/main/java/io/swagger/model/core/SeasonListResponse.java
index 3c645c1c..d460197e 100644
--- a/src/main/java/io/swagger/model/core/SeasonListResponse.java
+++ b/src/main/java/io/swagger/model/core/SeasonListResponse.java
@@ -16,7 +16,7 @@
  * SeasonListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class SeasonListResponse implements BrAPIResponse<SeasonListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/SeasonListResponseResult.java b/src/main/java/io/swagger/model/core/SeasonListResponseResult.java
index 3528a41d..5e0968ba 100644
--- a/src/main/java/io/swagger/model/core/SeasonListResponseResult.java
+++ b/src/main/java/io/swagger/model/core/SeasonListResponseResult.java
@@ -16,7 +16,7 @@
  * SeasonListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class SeasonListResponseResult implements BrAPIResponseResult<Season>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/SeasonSingleResponse.java b/src/main/java/io/swagger/model/core/SeasonSingleResponse.java
index c22235f3..d32a4036 100644
--- a/src/main/java/io/swagger/model/core/SeasonSingleResponse.java
+++ b/src/main/java/io/swagger/model/core/SeasonSingleResponse.java
@@ -16,7 +16,7 @@
  * SeasonSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class SeasonSingleResponse implements BrAPIResponse<Season>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/ServerInfo.java b/src/main/java/io/swagger/model/core/ServerInfo.java
index 8829201e..2901af2f 100644
--- a/src/main/java/io/swagger/model/core/ServerInfo.java
+++ b/src/main/java/io/swagger/model/core/ServerInfo.java
@@ -14,7 +14,7 @@
  * ServerInfo
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ServerInfo   {
   @JsonProperty("calls")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/ServerInfoResponse.java b/src/main/java/io/swagger/model/core/ServerInfoResponse.java
index 7b404fd2..4d04699b 100644
--- a/src/main/java/io/swagger/model/core/ServerInfoResponse.java
+++ b/src/main/java/io/swagger/model/core/ServerInfoResponse.java
@@ -14,7 +14,7 @@
  * CallsResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ServerInfoResponse implements BrAPIResponse<ServerInfo>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/SortBy.java b/src/main/java/io/swagger/model/core/SortBy.java
index 10eb760e..8a132a3e 100644
--- a/src/main/java/io/swagger/model/core/SortBy.java
+++ b/src/main/java/io/swagger/model/core/SortBy.java
@@ -32,8 +32,7 @@ public enum SortBy {
     GERMPLASMDBID("germplasmDbId"),
     
     OBSERVATIONVARIABLEDBID("observationVariableDbId");
-
-    private String value;
+private String value;
 
     SortBy(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/core/SortOrder.java b/src/main/java/io/swagger/model/core/SortOrder.java
index 7473dce5..0e5b36bd 100644
--- a/src/main/java/io/swagger/model/core/SortOrder.java
+++ b/src/main/java/io/swagger/model/core/SortOrder.java
@@ -7,8 +7,7 @@ public enum SortOrder {
     ASC("ASC"),
     
     DESC("DESC");
-
-    private String value;
+private String value;
 
     SortOrder(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/core/Study.java b/src/main/java/io/swagger/model/core/Study.java
index 5ecca671..1d265d98 100644
--- a/src/main/java/io/swagger/model/core/Study.java
+++ b/src/main/java/io/swagger/model/core/Study.java
@@ -11,7 +11,7 @@
  * Study
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Study extends StudyNewRequest  {
   @JsonProperty("studyDbId")
   private String studyDbId = null;
diff --git a/src/main/java/io/swagger/model/core/StudyLastUpdate.java b/src/main/java/io/swagger/model/core/StudyLastUpdate.java
index c80d8d89..6b1021e1 100644
--- a/src/main/java/io/swagger/model/core/StudyLastUpdate.java
+++ b/src/main/java/io/swagger/model/core/StudyLastUpdate.java
@@ -14,7 +14,7 @@
  */
 @ApiModel(description = "The date and time when this study was last modified")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class StudyLastUpdate   {
   @JsonProperty("timestamp")
   private OffsetDateTime timestamp = null;
diff --git a/src/main/java/io/swagger/model/core/StudyListResponse.java b/src/main/java/io/swagger/model/core/StudyListResponse.java
index f81fb8f2..3e2f5514 100644
--- a/src/main/java/io/swagger/model/core/StudyListResponse.java
+++ b/src/main/java/io/swagger/model/core/StudyListResponse.java
@@ -16,7 +16,7 @@
  * StudyListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class StudyListResponse implements BrAPIResponse<StudyListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/StudyListResponseResult.java b/src/main/java/io/swagger/model/core/StudyListResponseResult.java
index 0aeca8e5..2898eb05 100644
--- a/src/main/java/io/swagger/model/core/StudyListResponseResult.java
+++ b/src/main/java/io/swagger/model/core/StudyListResponseResult.java
@@ -16,7 +16,7 @@
  * StudyListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class StudyListResponseResult implements BrAPIResponseResult<Study>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/StudySingleResponse.java b/src/main/java/io/swagger/model/core/StudySingleResponse.java
index e7d2937e..e68529c1 100644
--- a/src/main/java/io/swagger/model/core/StudySingleResponse.java
+++ b/src/main/java/io/swagger/model/core/StudySingleResponse.java
@@ -16,7 +16,7 @@
  * StudySingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class StudySingleResponse implements BrAPIResponse<Study>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/StudyTypesResponse.java b/src/main/java/io/swagger/model/core/StudyTypesResponse.java
index 530f34af..2eae33f9 100644
--- a/src/main/java/io/swagger/model/core/StudyTypesResponse.java
+++ b/src/main/java/io/swagger/model/core/StudyTypesResponse.java
@@ -16,7 +16,7 @@
  * StudyTypesResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class StudyTypesResponse implements BrAPIResponse<StudyTypesResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/StudyTypesResponseResult.java b/src/main/java/io/swagger/model/core/StudyTypesResponseResult.java
index 71ca98e0..9ce9375b 100644
--- a/src/main/java/io/swagger/model/core/StudyTypesResponseResult.java
+++ b/src/main/java/io/swagger/model/core/StudyTypesResponseResult.java
@@ -16,7 +16,7 @@
  * StudyTypesResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class StudyTypesResponseResult implements BrAPIResponseResult<String>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/Trial.java b/src/main/java/io/swagger/model/core/Trial.java
index 41fbd7ee..674d88d3 100644
--- a/src/main/java/io/swagger/model/core/Trial.java
+++ b/src/main/java/io/swagger/model/core/Trial.java
@@ -12,7 +12,7 @@
  * Trial
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class Trial extends TrialNewRequest  {
   @JsonProperty("trialDbId")
   private String trialDbId = null;
diff --git a/src/main/java/io/swagger/model/core/TrialListResponse.java b/src/main/java/io/swagger/model/core/TrialListResponse.java
index 1e80f489..ba4d0d8b 100644
--- a/src/main/java/io/swagger/model/core/TrialListResponse.java
+++ b/src/main/java/io/swagger/model/core/TrialListResponse.java
@@ -17,7 +17,7 @@
  * TrialListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class TrialListResponse implements BrAPIResponse<TrialListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/core/TrialListResponseResult.java b/src/main/java/io/swagger/model/core/TrialListResponseResult.java
index 30fcea08..99450c5f 100644
--- a/src/main/java/io/swagger/model/core/TrialListResponseResult.java
+++ b/src/main/java/io/swagger/model/core/TrialListResponseResult.java
@@ -17,7 +17,7 @@
  * TrialListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class TrialListResponseResult implements BrAPIResponseResult<Trial>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/core/TrialNewRequest.java b/src/main/java/io/swagger/model/core/TrialNewRequest.java
index 10236792..96d16739 100644
--- a/src/main/java/io/swagger/model/core/TrialNewRequest.java
+++ b/src/main/java/io/swagger/model/core/TrialNewRequest.java
@@ -19,7 +19,7 @@
  * TrialNewRequest
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class TrialNewRequest   {
   @JsonProperty("active")
   private Boolean active = null;
diff --git a/src/main/java/io/swagger/model/core/TrialNewRequestDatasetAuthorships.java b/src/main/java/io/swagger/model/core/TrialNewRequestDatasetAuthorships.java
index 5dce7529..111101a0 100644
--- a/src/main/java/io/swagger/model/core/TrialNewRequestDatasetAuthorships.java
+++ b/src/main/java/io/swagger/model/core/TrialNewRequestDatasetAuthorships.java
@@ -11,7 +11,7 @@
  * TrialNewRequestDatasetAuthorships
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class TrialNewRequestDatasetAuthorships   {
   @JsonProperty("datasetPUI")
   private String datasetPUI = null;
diff --git a/src/main/java/io/swagger/model/core/TrialNewRequestPublications.java b/src/main/java/io/swagger/model/core/TrialNewRequestPublications.java
index 26344fe2..5c94a847 100644
--- a/src/main/java/io/swagger/model/core/TrialNewRequestPublications.java
+++ b/src/main/java/io/swagger/model/core/TrialNewRequestPublications.java
@@ -9,7 +9,7 @@
  * TrialNewRequestPublications
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class TrialNewRequestPublications   {
   @JsonProperty("publicationPUI")
   private String publicationPUI = null;
diff --git a/src/main/java/io/swagger/model/core/TrialSingleResponse.java b/src/main/java/io/swagger/model/core/TrialSingleResponse.java
index 52a3e8c3..acaef02f 100644
--- a/src/main/java/io/swagger/model/core/TrialSingleResponse.java
+++ b/src/main/java/io/swagger/model/core/TrialSingleResponse.java
@@ -15,7 +15,7 @@
  * TrialSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class TrialSingleResponse implements BrAPIResponse<Trial>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/Analysis.java b/src/main/java/io/swagger/model/geno/Analysis.java
index a0cf8d60..d3756352 100644
--- a/src/main/java/io/swagger/model/geno/Analysis.java
+++ b/src/main/java/io/swagger/model/geno/Analysis.java
@@ -16,7 +16,7 @@
  */
 @ApiModel(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.")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class Analysis   {
   @JsonProperty("analysisDbId")
   private String analysisDbId = null;
diff --git a/src/main/java/io/swagger/model/geno/CallSetResponse.java b/src/main/java/io/swagger/model/geno/CallSetResponse.java
index 72ec71eb..59e26822 100644
--- a/src/main/java/io/swagger/model/geno/CallSetResponse.java
+++ b/src/main/java/io/swagger/model/geno/CallSetResponse.java
@@ -15,7 +15,7 @@
  * CallSetResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class CallSetResponse implements BrAPIResponse<CallSet>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/CallSetsListResponse.java b/src/main/java/io/swagger/model/geno/CallSetsListResponse.java
index 58fe748a..ba4b7310 100644
--- a/src/main/java/io/swagger/model/geno/CallSetsListResponse.java
+++ b/src/main/java/io/swagger/model/geno/CallSetsListResponse.java
@@ -17,7 +17,7 @@
  * CallSetsListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class CallSetsListResponse implements BrAPIResponse<CallSetsListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/CallSetsListResponseResult.java b/src/main/java/io/swagger/model/geno/CallSetsListResponseResult.java
index ddca843c..28bad4dd 100644
--- a/src/main/java/io/swagger/model/geno/CallSetsListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/CallSetsListResponseResult.java
@@ -17,7 +17,7 @@
  * CallSetsListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class CallSetsListResponseResult implements BrAPIResponseResult<CallSet>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/CallsListResponse.java b/src/main/java/io/swagger/model/geno/CallsListResponse.java
index e7db6924..74ab67b2 100644
--- a/src/main/java/io/swagger/model/geno/CallsListResponse.java
+++ b/src/main/java/io/swagger/model/geno/CallsListResponse.java
@@ -17,7 +17,7 @@
  * CallsListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class CallsListResponse implements BrAPIResponse<CallsListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/CallsListResponseResult.java b/src/main/java/io/swagger/model/geno/CallsListResponseResult.java
index 00dfaabc..705acbd4 100644
--- a/src/main/java/io/swagger/model/geno/CallsListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/CallsListResponseResult.java
@@ -17,7 +17,7 @@
  * CallsListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class CallsListResponseResult implements BrAPIResponseResult<Call>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/GenoFileDataFormatEnum.java b/src/main/java/io/swagger/model/geno/GenoFileDataFormatEnum.java
index 5a68f8d1..774b4155 100644
--- a/src/main/java/io/swagger/model/geno/GenoFileDataFormatEnum.java
+++ b/src/main/java/io/swagger/model/geno/GenoFileDataFormatEnum.java
@@ -9,8 +9,7 @@ public enum GenoFileDataFormatEnum {
     HAPMAP("Hapmap"),
     TABULAR("tabular"),
     JSON("JSON");
-
-    private String value;
+private String value;
 
     GenoFileDataFormatEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/geno/GenomeMap.java b/src/main/java/io/swagger/model/geno/GenomeMap.java
index 98bbf396..e09a71c2 100644
--- a/src/main/java/io/swagger/model/geno/GenomeMap.java
+++ b/src/main/java/io/swagger/model/geno/GenomeMap.java
@@ -16,7 +16,7 @@
  * GenomeMap
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class GenomeMap   {
   @JsonProperty("additionalInfo")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/GenomeMapListResponse.java b/src/main/java/io/swagger/model/geno/GenomeMapListResponse.java
index 3a30d33f..92c3a2a2 100644
--- a/src/main/java/io/swagger/model/geno/GenomeMapListResponse.java
+++ b/src/main/java/io/swagger/model/geno/GenomeMapListResponse.java
@@ -17,7 +17,7 @@
  * GenomeMapListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class GenomeMapListResponse implements BrAPIResponse<GenomeMapListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/GenomeMapListResponseResult.java b/src/main/java/io/swagger/model/geno/GenomeMapListResponseResult.java
index 410276fa..1151483e 100644
--- a/src/main/java/io/swagger/model/geno/GenomeMapListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/GenomeMapListResponseResult.java
@@ -17,7 +17,7 @@
  * GenomeMapListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class GenomeMapListResponseResult implements BrAPIResponseResult<GenomeMap>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/GenomeMapSingleResponse.java b/src/main/java/io/swagger/model/geno/GenomeMapSingleResponse.java
index c2cce645..e8bd6713 100644
--- a/src/main/java/io/swagger/model/geno/GenomeMapSingleResponse.java
+++ b/src/main/java/io/swagger/model/geno/GenomeMapSingleResponse.java
@@ -17,7 +17,7 @@
  * GenomeMapSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class GenomeMapSingleResponse implements BrAPIResponse<GenomeMap>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/LinkageGroup.java b/src/main/java/io/swagger/model/geno/LinkageGroup.java
index c39a2c82..e86324a1 100644
--- a/src/main/java/io/swagger/model/geno/LinkageGroup.java
+++ b/src/main/java/io/swagger/model/geno/LinkageGroup.java
@@ -15,7 +15,7 @@
  */
 @ApiModel(description = "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.")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class LinkageGroup   {
   @JsonProperty("additionalInfo")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/LinkageGroupListResponse.java b/src/main/java/io/swagger/model/geno/LinkageGroupListResponse.java
index b1768ed8..f10976e3 100644
--- a/src/main/java/io/swagger/model/geno/LinkageGroupListResponse.java
+++ b/src/main/java/io/swagger/model/geno/LinkageGroupListResponse.java
@@ -17,7 +17,7 @@
  * LinkageGroupListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class LinkageGroupListResponse implements BrAPIResponse<LinkageGroupListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/LinkageGroupListResponseResult.java b/src/main/java/io/swagger/model/geno/LinkageGroupListResponseResult.java
index c55fc646..ed59ef5c 100644
--- a/src/main/java/io/swagger/model/geno/LinkageGroupListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/LinkageGroupListResponseResult.java
@@ -17,7 +17,7 @@
  * LinkageGroupListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class LinkageGroupListResponseResult implements BrAPIResponseResult<LinkageGroup>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/ListValue.java b/src/main/java/io/swagger/model/geno/ListValue.java
index eabb2452..627f1f1e 100644
--- a/src/main/java/io/swagger/model/geno/ListValue.java
+++ b/src/main/java/io/swagger/model/geno/ListValue.java
@@ -15,7 +15,7 @@
  */
 @ApiModel(description = "`ListValue` is a wrapper around a repeated field of values.  The JSON representation for `ListValue` is JSON array.")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class ListValue   {
   @JsonProperty("values")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/MarkerPosition.java b/src/main/java/io/swagger/model/geno/MarkerPosition.java
index 7d008afd..38fd8db8 100644
--- a/src/main/java/io/swagger/model/geno/MarkerPosition.java
+++ b/src/main/java/io/swagger/model/geno/MarkerPosition.java
@@ -14,7 +14,7 @@
  * MarkerPosition
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class MarkerPosition   {
   @JsonProperty("additionalInfo")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/MarkerPositionsListResponse.java b/src/main/java/io/swagger/model/geno/MarkerPositionsListResponse.java
index d2c22f65..357dac20 100644
--- a/src/main/java/io/swagger/model/geno/MarkerPositionsListResponse.java
+++ b/src/main/java/io/swagger/model/geno/MarkerPositionsListResponse.java
@@ -17,7 +17,7 @@
  * MarkerPositionListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class MarkerPositionsListResponse implements BrAPIResponse<MarkerPositionsListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/MarkerPositionsListResponseResult.java b/src/main/java/io/swagger/model/geno/MarkerPositionsListResponseResult.java
index f8f4b961..ec69b1ec 100644
--- a/src/main/java/io/swagger/model/geno/MarkerPositionsListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/MarkerPositionsListResponseResult.java
@@ -17,7 +17,7 @@
  * MarkerPositionListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class MarkerPositionsListResponseResult implements BrAPIResponseResult<MarkerPosition>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/Measurement.java b/src/main/java/io/swagger/model/geno/Measurement.java
index 8115a741..94254898 100644
--- a/src/main/java/io/swagger/model/geno/Measurement.java
+++ b/src/main/java/io/swagger/model/geno/Measurement.java
@@ -14,7 +14,7 @@
  */
 @ApiModel(description = "A value with units")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class Measurement   {
   @JsonProperty("units")
   private String units = null;
diff --git a/src/main/java/io/swagger/model/geno/OntologyTerm.java b/src/main/java/io/swagger/model/geno/OntologyTerm.java
index 1af03958..688c77c8 100644
--- a/src/main/java/io/swagger/model/geno/OntologyTerm.java
+++ b/src/main/java/io/swagger/model/geno/OntologyTerm.java
@@ -12,7 +12,7 @@
  */
 @ApiModel(description = "An ontology term describing an attribute.")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class OntologyTerm   {
   @JsonProperty("term")
   private String term = null;
diff --git a/src/main/java/io/swagger/model/geno/ReferenceBases.java b/src/main/java/io/swagger/model/geno/ReferenceBases.java
index e5ff25c8..b552dde9 100644
--- a/src/main/java/io/swagger/model/geno/ReferenceBases.java
+++ b/src/main/java/io/swagger/model/geno/ReferenceBases.java
@@ -12,7 +12,7 @@
  */
 @ApiModel(description = "A string representation of the reference base alleles.")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class ReferenceBases   {
   @JsonProperty("nextPageToken")
   private String nextPageToken = null;
diff --git a/src/main/java/io/swagger/model/geno/ReferenceBasesResponse.java b/src/main/java/io/swagger/model/geno/ReferenceBasesResponse.java
index 3085fdd7..b40897c1 100644
--- a/src/main/java/io/swagger/model/geno/ReferenceBasesResponse.java
+++ b/src/main/java/io/swagger/model/geno/ReferenceBasesResponse.java
@@ -17,7 +17,7 @@
  * ReferenceBasesResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class ReferenceBasesResponse implements BrAPIResponse<ReferenceBases>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/ReferenceSetsListResponseResult.java b/src/main/java/io/swagger/model/geno/ReferenceSetsListResponseResult.java
index 0b60b357..5cb2bb18 100644
--- a/src/main/java/io/swagger/model/geno/ReferenceSetsListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/ReferenceSetsListResponseResult.java
@@ -17,7 +17,7 @@
  * ReferenceSetsListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class ReferenceSetsListResponseResult implements BrAPIResponseResult<ReferenceSet>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/ReferenceSetsSingleResponse.java b/src/main/java/io/swagger/model/geno/ReferenceSetsSingleResponse.java
index 70cb4279..439cd663 100644
--- a/src/main/java/io/swagger/model/geno/ReferenceSetsSingleResponse.java
+++ b/src/main/java/io/swagger/model/geno/ReferenceSetsSingleResponse.java
@@ -17,7 +17,7 @@
  * ReferenceSetsSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class ReferenceSetsSingleResponse implements BrAPIResponse<ReferenceSet>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/ReferenceSingleResponse.java b/src/main/java/io/swagger/model/geno/ReferenceSingleResponse.java
index c4193022..fe0271d3 100644
--- a/src/main/java/io/swagger/model/geno/ReferenceSingleResponse.java
+++ b/src/main/java/io/swagger/model/geno/ReferenceSingleResponse.java
@@ -17,7 +17,7 @@
  * ReferenceSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class ReferenceSingleResponse implements BrAPIResponse<Reference>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/ReferencesListResponse.java b/src/main/java/io/swagger/model/geno/ReferencesListResponse.java
index 948fcf31..5a1b4f68 100644
--- a/src/main/java/io/swagger/model/geno/ReferencesListResponse.java
+++ b/src/main/java/io/swagger/model/geno/ReferencesListResponse.java
@@ -17,7 +17,7 @@
  * ReferencesListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class ReferencesListResponse implements BrAPIResponse<ReferencesListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/ReferencesListResponseResult.java b/src/main/java/io/swagger/model/geno/ReferencesListResponseResult.java
index 7c46daea..693f64ab 100644
--- a/src/main/java/io/swagger/model/geno/ReferencesListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/ReferencesListResponseResult.java
@@ -17,7 +17,7 @@
  * ReferencesListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class ReferencesListResponseResult implements BrAPIResponseResult<Reference>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/Sample.java b/src/main/java/io/swagger/model/geno/Sample.java
index 59c91310..5194ac07 100644
--- a/src/main/java/io/swagger/model/geno/Sample.java
+++ b/src/main/java/io/swagger/model/geno/Sample.java
@@ -9,7 +9,7 @@
  * Sample
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class Sample extends SampleNewRequest  {
   @JsonProperty("sampleDbId")
   private String sampleDbId = null;
diff --git a/src/main/java/io/swagger/model/geno/SampleListResponse.java b/src/main/java/io/swagger/model/geno/SampleListResponse.java
index a491189e..74263481 100644
--- a/src/main/java/io/swagger/model/geno/SampleListResponse.java
+++ b/src/main/java/io/swagger/model/geno/SampleListResponse.java
@@ -17,7 +17,7 @@
  * SampleListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class SampleListResponse implements BrAPIResponse<SampleListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/SampleListResponseResult.java b/src/main/java/io/swagger/model/geno/SampleListResponseResult.java
index 86e4926b..f351c239 100644
--- a/src/main/java/io/swagger/model/geno/SampleListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/SampleListResponseResult.java
@@ -17,7 +17,7 @@
  * SampleListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class SampleListResponseResult implements BrAPIResponseResult<Sample>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/SampleNewRequest.java b/src/main/java/io/swagger/model/geno/SampleNewRequest.java
index 7a37cefe..1e0d3058 100644
--- a/src/main/java/io/swagger/model/geno/SampleNewRequest.java
+++ b/src/main/java/io/swagger/model/geno/SampleNewRequest.java
@@ -18,7 +18,7 @@
  * SampleNewRequest
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class SampleNewRequest   {
   @JsonProperty("additionalInfo")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/SampleSingleResponse.java b/src/main/java/io/swagger/model/geno/SampleSingleResponse.java
index 7a6fec78..72332901 100644
--- a/src/main/java/io/swagger/model/geno/SampleSingleResponse.java
+++ b/src/main/java/io/swagger/model/geno/SampleSingleResponse.java
@@ -17,7 +17,7 @@
  * SampleSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class SampleSingleResponse implements BrAPIResponse<Sample>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/ShipmentForm.java b/src/main/java/io/swagger/model/geno/ShipmentForm.java
index 619919fb..c91981a1 100644
--- a/src/main/java/io/swagger/model/geno/ShipmentForm.java
+++ b/src/main/java/io/swagger/model/geno/ShipmentForm.java
@@ -12,7 +12,7 @@
  * ShipmentForm
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class ShipmentForm   {
   @JsonProperty("fileDescription")
   private String fileDescription = null;
diff --git a/src/main/java/io/swagger/model/geno/VariantSetResponse.java b/src/main/java/io/swagger/model/geno/VariantSetResponse.java
index aa9faf5d..71ca7b68 100644
--- a/src/main/java/io/swagger/model/geno/VariantSetResponse.java
+++ b/src/main/java/io/swagger/model/geno/VariantSetResponse.java
@@ -17,7 +17,7 @@
  * VariantSetResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VariantSetResponse implements BrAPIResponse<VariantSet>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/VariantSetsExtractRequest.java b/src/main/java/io/swagger/model/geno/VariantSetsExtractRequest.java
index e151f9a2..51ed9a53 100644
--- a/src/main/java/io/swagger/model/geno/VariantSetsExtractRequest.java
+++ b/src/main/java/io/swagger/model/geno/VariantSetsExtractRequest.java
@@ -15,7 +15,7 @@
  * VariantSetsExtractRequest
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VariantSetsExtractRequest {
   @JsonProperty("callSetDbIds")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/VariantSetsListResponseResult.java b/src/main/java/io/swagger/model/geno/VariantSetsListResponseResult.java
index 8181f5d1..3195bb0a 100644
--- a/src/main/java/io/swagger/model/geno/VariantSetsListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/VariantSetsListResponseResult.java
@@ -8,7 +8,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VariantSetsListResponseResult implements BrAPIResponseResult<VariantSet> {
 	@JsonProperty("data")
 
diff --git a/src/main/java/io/swagger/model/geno/VariantSingleResponse.java b/src/main/java/io/swagger/model/geno/VariantSingleResponse.java
index 5696a0e9..fb6e9395 100644
--- a/src/main/java/io/swagger/model/geno/VariantSingleResponse.java
+++ b/src/main/java/io/swagger/model/geno/VariantSingleResponse.java
@@ -12,7 +12,7 @@
 
 
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VariantSingleResponse implements BrAPIResponse<Variant>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/VariantsListResponse.java b/src/main/java/io/swagger/model/geno/VariantsListResponse.java
index e8acf35a..e7a2cdd4 100644
--- a/src/main/java/io/swagger/model/geno/VariantsListResponse.java
+++ b/src/main/java/io/swagger/model/geno/VariantsListResponse.java
@@ -17,7 +17,7 @@
  * VariantsListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VariantsListResponse implements BrAPIResponse<VariantsListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/VariantsListResponseResult.java b/src/main/java/io/swagger/model/geno/VariantsListResponseResult.java
index 2062934d..8f7ea9b0 100644
--- a/src/main/java/io/swagger/model/geno/VariantsListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/VariantsListResponseResult.java
@@ -17,7 +17,7 @@
  * VariantsListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VariantsListResponseResult implements BrAPIResponseResult<Variant>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/VendorContact.java b/src/main/java/io/swagger/model/geno/VendorContact.java
index 21e8a087..918457e5 100644
--- a/src/main/java/io/swagger/model/geno/VendorContact.java
+++ b/src/main/java/io/swagger/model/geno/VendorContact.java
@@ -12,7 +12,7 @@
  * VendorContact
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorContact   {
   @JsonProperty("vendorAddress")
   private String vendorAddress = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorOrder.java b/src/main/java/io/swagger/model/geno/VendorOrder.java
index 07256613..ea5b8e1a 100644
--- a/src/main/java/io/swagger/model/geno/VendorOrder.java
+++ b/src/main/java/io/swagger/model/geno/VendorOrder.java
@@ -18,7 +18,7 @@
  */
 @ApiModel(description = "The details of a vendor order")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorOrder   {
   @JsonProperty("clientId")
   private String clientId = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorOrderListResponse.java b/src/main/java/io/swagger/model/geno/VendorOrderListResponse.java
index 62b9dc38..c1249c25 100644
--- a/src/main/java/io/swagger/model/geno/VendorOrderListResponse.java
+++ b/src/main/java/io/swagger/model/geno/VendorOrderListResponse.java
@@ -17,7 +17,7 @@
  * VendorOrderListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorOrderListResponse implements BrAPIResponse<VendorOrderListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorOrderListResponseResult.java b/src/main/java/io/swagger/model/geno/VendorOrderListResponseResult.java
index d2f44504..fad55d26 100644
--- a/src/main/java/io/swagger/model/geno/VendorOrderListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/VendorOrderListResponseResult.java
@@ -17,7 +17,7 @@
  * VendorOrderListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorOrderListResponseResult implements BrAPIResponseResult<VendorOrder>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/VendorOrderStatusResponse.java b/src/main/java/io/swagger/model/geno/VendorOrderStatusResponse.java
index 28e28854..fa21255f 100644
--- a/src/main/java/io/swagger/model/geno/VendorOrderStatusResponse.java
+++ b/src/main/java/io/swagger/model/geno/VendorOrderStatusResponse.java
@@ -17,7 +17,7 @@
  * VendorOrderStatusResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorOrderStatusResponse implements BrAPIResponse<VendorOrderStatusResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorOrderStatusResponseResult.java b/src/main/java/io/swagger/model/geno/VendorOrderStatusResponseResult.java
index 564df271..cf9ab055 100644
--- a/src/main/java/io/swagger/model/geno/VendorOrderStatusResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/VendorOrderStatusResponseResult.java
@@ -14,7 +14,7 @@
  * VendorOrderStatusResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorOrderStatusResponseResult   {
   /**
    * Gets or Sets status
@@ -29,8 +29,7 @@ public enum StatusEnum {
     COMPLETED("completed"),
     
     REJECTED("rejected");
-
-    private String value;
+private String value;
 
     StatusEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/geno/VendorOrderSubmission.java b/src/main/java/io/swagger/model/geno/VendorOrderSubmission.java
index 55bc91c6..3d1b4b0b 100644
--- a/src/main/java/io/swagger/model/geno/VendorOrderSubmission.java
+++ b/src/main/java/io/swagger/model/geno/VendorOrderSubmission.java
@@ -16,7 +16,7 @@
  */
 @ApiModel(description = "Response to an order request")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorOrderSubmission   {
   @JsonProperty("orderId")
   private String orderId = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorOrderSubmissionRequest.java b/src/main/java/io/swagger/model/geno/VendorOrderSubmissionRequest.java
index b7a969b0..e52c2d32 100644
--- a/src/main/java/io/swagger/model/geno/VendorOrderSubmissionRequest.java
+++ b/src/main/java/io/swagger/model/geno/VendorOrderSubmissionRequest.java
@@ -16,7 +16,7 @@
  * VendorOrderSubmissionRequest
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorOrderSubmissionRequest extends VendorPlateSubmissionRequest  {
   @JsonProperty("requiredServiceInfo")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/VendorOrderSubmissionSingleResponse.java b/src/main/java/io/swagger/model/geno/VendorOrderSubmissionSingleResponse.java
index e05039ba..0b23659b 100644
--- a/src/main/java/io/swagger/model/geno/VendorOrderSubmissionSingleResponse.java
+++ b/src/main/java/io/swagger/model/geno/VendorOrderSubmissionSingleResponse.java
@@ -16,7 +16,7 @@
  * VendorOrderSubmissionSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorOrderSubmissionSingleResponse implements BrAPIResponse<VendorOrderSubmission>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorPlate.java b/src/main/java/io/swagger/model/geno/VendorPlate.java
index 110e65b3..037ef0b7 100644
--- a/src/main/java/io/swagger/model/geno/VendorPlate.java
+++ b/src/main/java/io/swagger/model/geno/VendorPlate.java
@@ -14,7 +14,7 @@
  * VendorPlate
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorPlate   {
   @JsonProperty("clientPlateBarcode")
   private String clientPlateBarcode = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorPlateListResponse.java b/src/main/java/io/swagger/model/geno/VendorPlateListResponse.java
index 39cc0fdc..3c6f9ac0 100644
--- a/src/main/java/io/swagger/model/geno/VendorPlateListResponse.java
+++ b/src/main/java/io/swagger/model/geno/VendorPlateListResponse.java
@@ -17,7 +17,7 @@
  * VendorPlateListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorPlateListResponse implements BrAPIResponse<VendorPlateListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorPlateListResponseResult.java b/src/main/java/io/swagger/model/geno/VendorPlateListResponseResult.java
index a06b8244..753b8a39 100644
--- a/src/main/java/io/swagger/model/geno/VendorPlateListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/VendorPlateListResponseResult.java
@@ -17,7 +17,7 @@
  * VendorPlateListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorPlateListResponseResult implements BrAPIResponseResult<VendorPlate>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/VendorPlateSubmission.java b/src/main/java/io/swagger/model/geno/VendorPlateSubmission.java
index 75937040..cf4c5fbc 100644
--- a/src/main/java/io/swagger/model/geno/VendorPlateSubmission.java
+++ b/src/main/java/io/swagger/model/geno/VendorPlateSubmission.java
@@ -16,7 +16,7 @@
  */
 @ApiModel(description = "Response of a plate submission")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorPlateSubmission   {
   @JsonProperty("clientId")
   private String clientId = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionId.java b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionId.java
index 8e7f81f2..91ef396f 100644
--- a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionId.java
+++ b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionId.java
@@ -13,7 +13,7 @@
  */
 @ApiModel(description = "Response to an order request")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorPlateSubmissionId   {
   @JsonProperty("submissionId")
   private String submissionId = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionIdSingleResponse.java b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionIdSingleResponse.java
index e328bf0b..451217fe 100644
--- a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionIdSingleResponse.java
+++ b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionIdSingleResponse.java
@@ -17,7 +17,7 @@
  * VendorPlateSubmissionIdSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorPlateSubmissionIdSingleResponse implements BrAPIResponse<VendorPlateSubmissionId>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionPlates.java b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionPlates.java
index 95f79fa9..887904c6 100644
--- a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionPlates.java
+++ b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionPlates.java
@@ -14,7 +14,7 @@
  * VendorPlateSubmissionPlates
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorPlateSubmissionPlates   {
   @JsonProperty("clientPlateBarcode")
   private String clientPlateBarcode = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionRequest.java b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionRequest.java
index af76e326..b2a1f79c 100644
--- a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionRequest.java
+++ b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionRequest.java
@@ -20,7 +20,7 @@
  */
 @ApiModel(description = "Request object structure to submit plate data to a vendor")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorPlateSubmissionRequest   {
   @JsonProperty("clientId")
   private String clientId = null;
@@ -41,8 +41,7 @@ public enum SampleTypeEnum {
     RNA("RNA"),
     
     TISSUE("Tissue");
-
-    private String value;
+private String value;
 
     SampleTypeEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionRequestPlates.java b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionRequestPlates.java
index 23b0fc1c..d3b6b3df 100644
--- a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionRequestPlates.java
+++ b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionRequestPlates.java
@@ -14,7 +14,7 @@
  * VendorPlateSubmissionRequestPlates
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorPlateSubmissionRequestPlates   {
   @JsonProperty("clientPlateBarcode")
   private String clientPlateBarcode = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionSingleResponse.java b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionSingleResponse.java
index 78e61374..67c30ad3 100644
--- a/src/main/java/io/swagger/model/geno/VendorPlateSubmissionSingleResponse.java
+++ b/src/main/java/io/swagger/model/geno/VendorPlateSubmissionSingleResponse.java
@@ -17,7 +17,7 @@
  * VendorPlateSubmissionSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorPlateSubmissionSingleResponse implements BrAPIResponse<VendorPlateSubmission>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorResultFile.java b/src/main/java/io/swagger/model/geno/VendorResultFile.java
index 995a26de..b54f57b9 100644
--- a/src/main/java/io/swagger/model/geno/VendorResultFile.java
+++ b/src/main/java/io/swagger/model/geno/VendorResultFile.java
@@ -17,7 +17,7 @@
  * VendorResultFile
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorResultFile   {
   @JsonProperty("additionalInfo")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/VendorResultFileListResponse.java b/src/main/java/io/swagger/model/geno/VendorResultFileListResponse.java
index 96f3cb1e..5bea7e1b 100644
--- a/src/main/java/io/swagger/model/geno/VendorResultFileListResponse.java
+++ b/src/main/java/io/swagger/model/geno/VendorResultFileListResponse.java
@@ -17,7 +17,7 @@
  * VendorResultFileListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorResultFileListResponse implements BrAPIResponse<VendorResultFileListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorResultFileListResponseResult.java b/src/main/java/io/swagger/model/geno/VendorResultFileListResponseResult.java
index 1c3b5682..945556f6 100644
--- a/src/main/java/io/swagger/model/geno/VendorResultFileListResponseResult.java
+++ b/src/main/java/io/swagger/model/geno/VendorResultFileListResponseResult.java
@@ -17,7 +17,7 @@
  * VendorResultFileListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorResultFileListResponseResult implements BrAPIResponseResult<VendorResultFile>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/VendorSample.java b/src/main/java/io/swagger/model/geno/VendorSample.java
index 17164f71..72531720 100644
--- a/src/main/java/io/swagger/model/geno/VendorSample.java
+++ b/src/main/java/io/swagger/model/geno/VendorSample.java
@@ -15,7 +15,7 @@
  * VendorSample
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorSample   {
   @JsonProperty("clientSampleBarCode")
   private String clientSampleBarCode = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorServicePlatformMarkerTypeEnum.java b/src/main/java/io/swagger/model/geno/VendorServicePlatformMarkerTypeEnum.java
index 302bb478..135c2e96 100644
--- a/src/main/java/io/swagger/model/geno/VendorServicePlatformMarkerTypeEnum.java
+++ b/src/main/java/io/swagger/model/geno/VendorServicePlatformMarkerTypeEnum.java
@@ -6,8 +6,7 @@
 public enum VendorServicePlatformMarkerTypeEnum {
     FIXED("FIXED"),
     DISCOVERABLE("DISCOVERABLE");
-
-    private String value;
+private String value;
 
     VendorServicePlatformMarkerTypeEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/geno/VendorSpecification.java b/src/main/java/io/swagger/model/geno/VendorSpecification.java
index f6b3ee9f..5934476f 100644
--- a/src/main/java/io/swagger/model/geno/VendorSpecification.java
+++ b/src/main/java/io/swagger/model/geno/VendorSpecification.java
@@ -16,7 +16,7 @@
  * VendorSpecification
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorSpecification   {
   @JsonProperty("additionalInfo")
   @Valid
diff --git a/src/main/java/io/swagger/model/geno/VendorSpecificationService.java b/src/main/java/io/swagger/model/geno/VendorSpecificationService.java
index 1203e913..c144fee2 100644
--- a/src/main/java/io/swagger/model/geno/VendorSpecificationService.java
+++ b/src/main/java/io/swagger/model/geno/VendorSpecificationService.java
@@ -15,7 +15,7 @@
  * VendorSpecificationService
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorSpecificationService   {
   @JsonProperty("serviceDescription")
   private String serviceDescription = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorSpecificationServiceSpecificRequirements.java b/src/main/java/io/swagger/model/geno/VendorSpecificationServiceSpecificRequirements.java
index 9ae1552f..5f06b1dc 100644
--- a/src/main/java/io/swagger/model/geno/VendorSpecificationServiceSpecificRequirements.java
+++ b/src/main/java/io/swagger/model/geno/VendorSpecificationServiceSpecificRequirements.java
@@ -11,7 +11,7 @@
  * VendorSpecificationServiceSpecificRequirements
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorSpecificationServiceSpecificRequirements   {
   @JsonProperty("description")
   private String description = null;
diff --git a/src/main/java/io/swagger/model/geno/VendorSpecificationSingleResponse.java b/src/main/java/io/swagger/model/geno/VendorSpecificationSingleResponse.java
index a3f3e91f..0b6a13de 100644
--- a/src/main/java/io/swagger/model/geno/VendorSpecificationSingleResponse.java
+++ b/src/main/java/io/swagger/model/geno/VendorSpecificationSingleResponse.java
@@ -17,7 +17,7 @@
  * VendorSpecificationSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class VendorSpecificationSingleResponse implements BrAPIResponse<VendorSpecification>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/BiologicalStatusOfAccessionCode.java b/src/main/java/io/swagger/model/germ/BiologicalStatusOfAccessionCode.java
index efdabd3f..451a5cf1 100644
--- a/src/main/java/io/swagger/model/germ/BiologicalStatusOfAccessionCode.java
+++ b/src/main/java/io/swagger/model/germ/BiologicalStatusOfAccessionCode.java
@@ -25,9 +25,7 @@ public enum BiologicalStatusOfAccessionCode {
     _500("500", "Advanced or improved cultivar (conventional breeding methods)"),
     _600("600", "GMO (by genetic engineering)"),
     _999("999", "Other (Elaborate in REMARKS field)");
-
-    private String value;
-    private String description;
+private String value;private String description;
 
     public String getDescription() {
 		return description;
diff --git a/src/main/java/io/swagger/model/germ/BreedingMethod.java b/src/main/java/io/swagger/model/germ/BreedingMethod.java
index 9bfc9259..976194e6 100644
--- a/src/main/java/io/swagger/model/germ/BreedingMethod.java
+++ b/src/main/java/io/swagger/model/germ/BreedingMethod.java
@@ -12,7 +12,7 @@
  * BreedingMethod
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class BreedingMethod   {
   @JsonProperty("abbreviation")
   private String abbreviation = null;
diff --git a/src/main/java/io/swagger/model/germ/BreedingMethodListResponse.java b/src/main/java/io/swagger/model/germ/BreedingMethodListResponse.java
index f885bff5..32e5a914 100644
--- a/src/main/java/io/swagger/model/germ/BreedingMethodListResponse.java
+++ b/src/main/java/io/swagger/model/germ/BreedingMethodListResponse.java
@@ -19,7 +19,7 @@
  * BreedingMethodListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class BreedingMethodListResponse implements BrAPIResponse<BreedingMethodListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/BreedingMethodListResponseResult.java b/src/main/java/io/swagger/model/germ/BreedingMethodListResponseResult.java
index 55226808..e63d933c 100644
--- a/src/main/java/io/swagger/model/germ/BreedingMethodListResponseResult.java
+++ b/src/main/java/io/swagger/model/germ/BreedingMethodListResponseResult.java
@@ -17,7 +17,7 @@
  * BreedingMethodListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class BreedingMethodListResponseResult implements BrAPIResponseResult<BreedingMethod>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/germ/BreedingMethodSingleResponse.java b/src/main/java/io/swagger/model/germ/BreedingMethodSingleResponse.java
index 79c8e030..043a8ff4 100644
--- a/src/main/java/io/swagger/model/germ/BreedingMethodSingleResponse.java
+++ b/src/main/java/io/swagger/model/germ/BreedingMethodSingleResponse.java
@@ -19,7 +19,7 @@
  * BreedingMethodSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class BreedingMethodSingleResponse implements BrAPIResponse<BreedingMethod>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/CrossNewRequestCrossAttributes.java b/src/main/java/io/swagger/model/germ/CrossNewRequestCrossAttributes.java
index 3c4fc72c..d2d432d7 100644
--- a/src/main/java/io/swagger/model/germ/CrossNewRequestCrossAttributes.java
+++ b/src/main/java/io/swagger/model/germ/CrossNewRequestCrossAttributes.java
@@ -12,7 +12,7 @@
  */
 @ApiModel(description = "a custom attributes associated with a cross")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class CrossNewRequestCrossAttributes   {
   @JsonProperty("crossAttributeName")
   private String crossAttributeName = null;
diff --git a/src/main/java/io/swagger/model/germ/CrossType.java b/src/main/java/io/swagger/model/germ/CrossType.java
index f5f49148..6012e635 100644
--- a/src/main/java/io/swagger/model/germ/CrossType.java
+++ b/src/main/java/io/swagger/model/germ/CrossType.java
@@ -17,8 +17,7 @@ public enum CrossType {
     BULK_OPEN_POLLINATED("BULK_OPEN_POLLINATED"),
     
     DOUBLE_HAPLOID("DOUBLE_HAPLOID");
-
-    private String value;
+private String value;
 
     CrossType(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/germ/CrossesListResponse.java b/src/main/java/io/swagger/model/germ/CrossesListResponse.java
index f45c5dbb..17c50787 100644
--- a/src/main/java/io/swagger/model/germ/CrossesListResponse.java
+++ b/src/main/java/io/swagger/model/germ/CrossesListResponse.java
@@ -19,7 +19,7 @@
  * CrossesListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class CrossesListResponse implements BrAPIResponse<CrossesListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/CrossesListResponseResult.java b/src/main/java/io/swagger/model/germ/CrossesListResponseResult.java
index 4074be98..534511b1 100644
--- a/src/main/java/io/swagger/model/germ/CrossesListResponseResult.java
+++ b/src/main/java/io/swagger/model/germ/CrossesListResponseResult.java
@@ -17,7 +17,7 @@
  * CrossesListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class CrossesListResponseResult implements BrAPIResponseResult<Cross>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/germ/CrossingProjectsListResponse.java b/src/main/java/io/swagger/model/germ/CrossingProjectsListResponse.java
index c12c65db..0402cc3b 100644
--- a/src/main/java/io/swagger/model/germ/CrossingProjectsListResponse.java
+++ b/src/main/java/io/swagger/model/germ/CrossingProjectsListResponse.java
@@ -19,7 +19,7 @@
  * CrossingProjectsListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class CrossingProjectsListResponse implements BrAPIResponse<CrossingProjectsListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/CrossingProjectsListResponseResult.java b/src/main/java/io/swagger/model/germ/CrossingProjectsListResponseResult.java
index ca6ce7e5..416daffa 100644
--- a/src/main/java/io/swagger/model/germ/CrossingProjectsListResponseResult.java
+++ b/src/main/java/io/swagger/model/germ/CrossingProjectsListResponseResult.java
@@ -17,7 +17,7 @@
  * CrossingProjectsListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class CrossingProjectsListResponseResult implements BrAPIResponseResult<CrossingProject>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/germ/CrossingProjectsSingleResponse.java b/src/main/java/io/swagger/model/germ/CrossingProjectsSingleResponse.java
index 3624e7d5..4af4181b 100644
--- a/src/main/java/io/swagger/model/germ/CrossingProjectsSingleResponse.java
+++ b/src/main/java/io/swagger/model/germ/CrossingProjectsSingleResponse.java
@@ -19,7 +19,7 @@
  * CrossingProjectListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class CrossingProjectsSingleResponse implements BrAPIResponse<CrossingProject>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttribute.java b/src/main/java/io/swagger/model/germ/GermplasmAttribute.java
index c0dc72df..d9ba1821 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttribute.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttribute.java
@@ -13,7 +13,7 @@
  * GermplasmAttribute
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttribute extends GermplasmAttributeNewRequest  {
   @JsonProperty("attributeDbId")
   private String attributeDbId = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttributeCategoryListResponse.java b/src/main/java/io/swagger/model/germ/GermplasmAttributeCategoryListResponse.java
index 1098ea4b..f2f4ea93 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttributeCategoryListResponse.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttributeCategoryListResponse.java
@@ -19,7 +19,7 @@
  * GermplasmAttributeCategoryListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttributeCategoryListResponse implements BrAPIResponse<GermplasmAttributeCategoryListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttributeCategoryListResponseResult.java b/src/main/java/io/swagger/model/germ/GermplasmAttributeCategoryListResponseResult.java
index 5721afc3..6d893fc3 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttributeCategoryListResponseResult.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttributeCategoryListResponseResult.java
@@ -17,7 +17,7 @@
  * GermplasmAttributeCategoryListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttributeCategoryListResponseResult implements BrAPIResponseResult<String>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttributeListResponse.java b/src/main/java/io/swagger/model/germ/GermplasmAttributeListResponse.java
index 8ce9851a..ca960f13 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttributeListResponse.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttributeListResponse.java
@@ -18,7 +18,7 @@
  * GermplasmAttributeListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttributeListResponse implements BrAPIResponse<GermplasmAttributeListResponseResult> {
 	@JsonProperty("@context")
 	private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttributeListResponseResult.java b/src/main/java/io/swagger/model/germ/GermplasmAttributeListResponseResult.java
index a20cea84..c4e31153 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttributeListResponseResult.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttributeListResponseResult.java
@@ -16,7 +16,7 @@
  * GermplasmAttributeListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttributeListResponseResult implements BrAPIResponseResult<GermplasmAttribute> {
 	@JsonProperty("data")
 	@Valid
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttributeSingleResponse.java b/src/main/java/io/swagger/model/germ/GermplasmAttributeSingleResponse.java
index 9d26484f..25daec85 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttributeSingleResponse.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttributeSingleResponse.java
@@ -19,7 +19,7 @@
  * GermplasmAttributeSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttributeSingleResponse implements BrAPIResponse<GermplasmAttribute>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttributeValue.java b/src/main/java/io/swagger/model/germ/GermplasmAttributeValue.java
index 4670cadc..5ad54675 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttributeValue.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttributeValue.java
@@ -13,7 +13,7 @@
  * GermplasmAttributeValue
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttributeValue extends GermplasmAttributeValueNewRequest  {
   @JsonProperty("attributeValueDbId")
   private String attributeValueDbId = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttributeValueListResponse.java b/src/main/java/io/swagger/model/germ/GermplasmAttributeValueListResponse.java
index 1e9b4102..b7acf5e9 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttributeValueListResponse.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttributeValueListResponse.java
@@ -19,7 +19,7 @@
  * GermplasmAttributeValueListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttributeValueListResponse implements BrAPIResponse<GermplasmAttributeValueListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttributeValueListResponseResult.java b/src/main/java/io/swagger/model/germ/GermplasmAttributeValueListResponseResult.java
index b3d67e20..ed0bf1a4 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttributeValueListResponseResult.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttributeValueListResponseResult.java
@@ -17,7 +17,7 @@
  * GermplasmAttributeValueListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttributeValueListResponseResult implements BrAPIResponseResult<GermplasmAttributeValue>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttributeValueNewRequest.java b/src/main/java/io/swagger/model/germ/GermplasmAttributeValueNewRequest.java
index fbbaaad3..543de1ff 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttributeValueNewRequest.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttributeValueNewRequest.java
@@ -16,7 +16,7 @@
  * GermplasmAttributeValueNewRequest
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttributeValueNewRequest {
 	@JsonProperty("additionalInfo")
 	@Valid
diff --git a/src/main/java/io/swagger/model/germ/GermplasmAttributeValueSingleResponse.java b/src/main/java/io/swagger/model/germ/GermplasmAttributeValueSingleResponse.java
index ffb82ecd..6a2ee373 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmAttributeValueSingleResponse.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmAttributeValueSingleResponse.java
@@ -19,7 +19,7 @@
  * GermplasmAttributeValueSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmAttributeValueSingleResponse implements BrAPIResponse<GermplasmAttributeValue>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmListResponse.java b/src/main/java/io/swagger/model/germ/GermplasmListResponse.java
index 2dc0e179..2359b8cd 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmListResponse.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmListResponse.java
@@ -19,7 +19,7 @@
  * GermplasmListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmListResponse implements BrAPIResponse<GermplasmListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmListResponseResult.java b/src/main/java/io/swagger/model/germ/GermplasmListResponseResult.java
index 7f3f0572..3f5b2aa1 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmListResponseResult.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmListResponseResult.java
@@ -17,7 +17,7 @@
  * GermplasmListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmListResponseResult implements BrAPIResponseResult<Germplasm>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/germ/GermplasmMCPD.java b/src/main/java/io/swagger/model/germ/GermplasmMCPD.java
index 15b35d1b..bcca483d 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmMCPD.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmMCPD.java
@@ -22,7 +22,7 @@
  * GermplasmMCPD
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmMCPD   {
   @JsonProperty("accessionNames")
   @Valid
@@ -82,8 +82,7 @@ public enum AcquisitionSourceCodeEnum {
     _61("61"),
     _62("62"),
     _99("99");
-
-    private String value;
+private String value;
 
     AcquisitionSourceCodeEnum(String value) {
       this.value = value;
@@ -157,8 +156,7 @@ public enum MlsStatusEnum {
     _1("1"),
     
     _99("99");
-
-    private String value;
+private String value;
 
     MlsStatusEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmMCPDBreedingInstitutes.java b/src/main/java/io/swagger/model/germ/GermplasmMCPDBreedingInstitutes.java
index 550e4ba7..0d96d519 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmMCPDBreedingInstitutes.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmMCPDBreedingInstitutes.java
@@ -11,7 +11,7 @@
  * GermplasmMCPDBreedingInstitutes
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmMCPDBreedingInstitutes   {
   @JsonProperty("instituteCode")
   private String instituteCode = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfo.java b/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfo.java
index 56ee8250..d5a756ea 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfo.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfo.java
@@ -18,7 +18,7 @@
  */
 @ApiModel(description = "Information about the collection of this germplasm")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmMCPDCollectingInfo   {
   @JsonProperty("collectingDate")
   private LocalDate collectingDate = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfoCollectingInstitutes.java b/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfoCollectingInstitutes.java
index 9062b17c..a4da4439 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfoCollectingInstitutes.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfoCollectingInstitutes.java
@@ -10,7 +10,7 @@
  * GermplasmMCPDCollectingInfoCollectingInstitutes
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmMCPDCollectingInfoCollectingInstitutes   {
   @JsonProperty("instituteAddress")
   private String instituteAddress = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfoCollectingSite.java b/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfoCollectingSite.java
index 752dc857..d942ed5e 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfoCollectingSite.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmMCPDCollectingInfoCollectingSite.java
@@ -12,7 +12,7 @@
  */
 @ApiModel(description = "Information about the location where the sample was collected")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmMCPDCollectingInfoCollectingSite   {
   @JsonProperty("coordinateUncertainty")
   private String coordinateUncertainty = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmMCPDDonorInfo.java b/src/main/java/io/swagger/model/germ/GermplasmMCPDDonorInfo.java
index f53ac823..bf586db0 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmMCPDDonorInfo.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmMCPDDonorInfo.java
@@ -14,7 +14,7 @@
  */
 @ApiModel(description = "Information about the donor")
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmMCPDDonorInfo   {
   @JsonProperty("donorAccessionNumber")
   private String donorAccessionNumber = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmMCPDDonorInfoDonorInstitute.java b/src/main/java/io/swagger/model/germ/GermplasmMCPDDonorInfoDonorInstitute.java
index f889b3b6..8cc880a9 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmMCPDDonorInfoDonorInstitute.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmMCPDDonorInfoDonorInstitute.java
@@ -9,7 +9,7 @@
  * GermplasmMCPDDonorInfoDonorInstitute
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmMCPDDonorInfoDonorInstitute   {
   @JsonProperty("instituteCode")
   private String instituteCode = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmMCPDResponse.java b/src/main/java/io/swagger/model/germ/GermplasmMCPDResponse.java
index 6624a3f4..f5b98ed6 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmMCPDResponse.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmMCPDResponse.java
@@ -19,7 +19,7 @@
  * GermplasmMCPDResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmMCPDResponse implements BrAPIResponse<GermplasmMCPD>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmMCPDSafetyDuplicateInstitutes.java b/src/main/java/io/swagger/model/germ/GermplasmMCPDSafetyDuplicateInstitutes.java
index 2d6f5d4b..5168f419 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmMCPDSafetyDuplicateInstitutes.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmMCPDSafetyDuplicateInstitutes.java
@@ -9,7 +9,7 @@
  * GermplasmMCPDSafetyDuplicateInstitutes
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmMCPDSafetyDuplicateInstitutes   {
   @JsonProperty("instituteCode")
   private String instituteCode = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmNewRequestDonors.java b/src/main/java/io/swagger/model/germ/GermplasmNewRequestDonors.java
index adc92f11..10dfe8c4 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmNewRequestDonors.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmNewRequestDonors.java
@@ -11,7 +11,7 @@
  * GermplasmNewRequestDonors
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmNewRequestDonors   {
   @JsonProperty("donorAccessionNumber")
   private String donorAccessionNumber = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmNewRequestSynonyms.java b/src/main/java/io/swagger/model/germ/GermplasmNewRequestSynonyms.java
index c231ecda..9ff213e4 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmNewRequestSynonyms.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmNewRequestSynonyms.java
@@ -11,7 +11,7 @@
  * GermplasmNewRequestSynonyms
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmNewRequestSynonyms   {
   @JsonProperty("synonym")
   private String synonym = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmOrigin.java b/src/main/java/io/swagger/model/germ/GermplasmOrigin.java
index 0ae29b02..4dce7e6e 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmOrigin.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmOrigin.java
@@ -14,7 +14,7 @@
  * GermplasmOrigin
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmOrigin   {
   @JsonProperty("coordinateUncertainty")
   private String coordinateUncertainty = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmPedigreeResponse.java b/src/main/java/io/swagger/model/germ/GermplasmPedigreeResponse.java
index aea9bc1a..a00b50ca 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmPedigreeResponse.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmPedigreeResponse.java
@@ -18,7 +18,7 @@
  * GermplasmPedigreeResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmPedigreeResponse implements BrAPIResponse<PedigreeNode>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmProgenyResponse.java b/src/main/java/io/swagger/model/germ/GermplasmProgenyResponse.java
index 3b46b72a..7274db5a 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmProgenyResponse.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmProgenyResponse.java
@@ -18,7 +18,7 @@
  * ProgenyResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmProgenyResponse implements BrAPIResponse<ProgenyNode>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmSingleResponse.java b/src/main/java/io/swagger/model/germ/GermplasmSingleResponse.java
index 80ded3e6..056e984c 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmSingleResponse.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmSingleResponse.java
@@ -19,7 +19,7 @@
  * GermplasmSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class GermplasmSingleResponse implements BrAPIResponse<Germplasm>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/GermplasmStorageTypesEnum.java b/src/main/java/io/swagger/model/germ/GermplasmStorageTypesEnum.java
index 16b989c6..b0bc8370 100644
--- a/src/main/java/io/swagger/model/germ/GermplasmStorageTypesEnum.java
+++ b/src/main/java/io/swagger/model/germ/GermplasmStorageTypesEnum.java
@@ -9,7 +9,7 @@
  * GermplasmNewRequestStorageTypes
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public enum GermplasmStorageTypesEnum   {
   /**
    * 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)
@@ -23,9 +23,7 @@ public enum GermplasmStorageTypesEnum   {
     _40("40", "Cryo-preserved collection"),    
     _50("50", "DNA collection"),    
     _99("99", "Other");
-
-    private String value;
-    private String description;
+private String value;private String description;
 
     GermplasmStorageTypesEnum(String value, String description) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/germ/PlannedCrossesListResponse.java b/src/main/java/io/swagger/model/germ/PlannedCrossesListResponse.java
index ed4461f7..d6157c98 100644
--- a/src/main/java/io/swagger/model/germ/PlannedCrossesListResponse.java
+++ b/src/main/java/io/swagger/model/germ/PlannedCrossesListResponse.java
@@ -18,7 +18,7 @@
  * PlannedCrossesListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class PlannedCrossesListResponse implements BrAPIResponse<PlannedCrossesListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/PlannedCrossesListResponseResult.java b/src/main/java/io/swagger/model/germ/PlannedCrossesListResponseResult.java
index 8645ee74..376f190c 100644
--- a/src/main/java/io/swagger/model/germ/PlannedCrossesListResponseResult.java
+++ b/src/main/java/io/swagger/model/germ/PlannedCrossesListResponseResult.java
@@ -17,7 +17,7 @@
  * PlannedCrossesListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class PlannedCrossesListResponseResult implements BrAPIResponseResult<PlannedCross>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/germ/ProgenyNode.java b/src/main/java/io/swagger/model/germ/ProgenyNode.java
index 307ec5b3..07bfa2d4 100644
--- a/src/main/java/io/swagger/model/germ/ProgenyNode.java
+++ b/src/main/java/io/swagger/model/germ/ProgenyNode.java
@@ -16,7 +16,7 @@
  * ProgenyNode
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class ProgenyNode   {
   @JsonProperty("germplasmDbId")
   private String germplasmDbId = null;
diff --git a/src/main/java/io/swagger/model/germ/ProgenyNodeProgeny.java b/src/main/java/io/swagger/model/germ/ProgenyNodeProgeny.java
index a738af2d..c19ad7f2 100644
--- a/src/main/java/io/swagger/model/germ/ProgenyNodeProgeny.java
+++ b/src/main/java/io/swagger/model/germ/ProgenyNodeProgeny.java
@@ -12,7 +12,7 @@
  * ProgenyNodeProgeny
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class ProgenyNodeProgeny   {
   @JsonProperty("germplasmDbId")
   private String germplasmDbId = null;
diff --git a/src/main/java/io/swagger/model/germ/SeedLotListResponse.java b/src/main/java/io/swagger/model/germ/SeedLotListResponse.java
index 65a3c9d7..ba9f9b3d 100644
--- a/src/main/java/io/swagger/model/germ/SeedLotListResponse.java
+++ b/src/main/java/io/swagger/model/germ/SeedLotListResponse.java
@@ -18,7 +18,7 @@
  * SeedLotListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class SeedLotListResponse implements BrAPIResponse<SeedLotListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/SeedLotListResponseResult.java b/src/main/java/io/swagger/model/germ/SeedLotListResponseResult.java
index 66f28ed3..98881fe9 100644
--- a/src/main/java/io/swagger/model/germ/SeedLotListResponseResult.java
+++ b/src/main/java/io/swagger/model/germ/SeedLotListResponseResult.java
@@ -17,7 +17,7 @@
  * SeedLotListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class SeedLotListResponseResult implements BrAPIResponseResult<SeedLot>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/germ/SeedLotSingleResponse.java b/src/main/java/io/swagger/model/germ/SeedLotSingleResponse.java
index 5ae4c23d..25007b37 100644
--- a/src/main/java/io/swagger/model/germ/SeedLotSingleResponse.java
+++ b/src/main/java/io/swagger/model/germ/SeedLotSingleResponse.java
@@ -18,7 +18,7 @@
  * SeedLotSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class SeedLotSingleResponse implements BrAPIResponse<SeedLot>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/SeedLotTransactionListResponse.java b/src/main/java/io/swagger/model/germ/SeedLotTransactionListResponse.java
index a233fbb9..5ce033a7 100644
--- a/src/main/java/io/swagger/model/germ/SeedLotTransactionListResponse.java
+++ b/src/main/java/io/swagger/model/germ/SeedLotTransactionListResponse.java
@@ -18,7 +18,7 @@
  * SeedLotTransactionListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class SeedLotTransactionListResponse implements BrAPIResponse<SeedLotTransactionListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/germ/SeedLotTransactionListResponseResult.java b/src/main/java/io/swagger/model/germ/SeedLotTransactionListResponseResult.java
index 4a17dbc4..03d8326b 100644
--- a/src/main/java/io/swagger/model/germ/SeedLotTransactionListResponseResult.java
+++ b/src/main/java/io/swagger/model/germ/SeedLotTransactionListResponseResult.java
@@ -17,7 +17,7 @@
  * SeedLotTransactionListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class SeedLotTransactionListResponseResult implements BrAPIResponseResult<SeedLotTransaction>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/germ/TaxonID.java b/src/main/java/io/swagger/model/germ/TaxonID.java
index ca5ba633..5c305ce0 100644
--- a/src/main/java/io/swagger/model/germ/TaxonID.java
+++ b/src/main/java/io/swagger/model/germ/TaxonID.java
@@ -12,7 +12,7 @@
  * TaxonID
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 public class TaxonID   {
   @JsonProperty("sourceName")
   private String sourceName = null;
diff --git a/src/main/java/io/swagger/model/pheno/EntryTypeEnum.java b/src/main/java/io/swagger/model/pheno/EntryTypeEnum.java
index f6ed9824..c6e1ce88 100644
--- a/src/main/java/io/swagger/model/pheno/EntryTypeEnum.java
+++ b/src/main/java/io/swagger/model/pheno/EntryTypeEnum.java
@@ -7,8 +7,7 @@ public enum EntryTypeEnum {
     CHECK("CHECK"),
     TEST("TEST"),
     FILLER("FILLER");
-
-    private String value;
+private String value;
 
     EntryTypeEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/pheno/Image.java b/src/main/java/io/swagger/model/pheno/Image.java
index ce7cad0b..c248dae0 100644
--- a/src/main/java/io/swagger/model/pheno/Image.java
+++ b/src/main/java/io/swagger/model/pheno/Image.java
@@ -12,7 +12,7 @@
  * Image
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class Image extends ImageNewRequest  {
   @JsonProperty("imageDbId")
   private String imageDbId = null;
diff --git a/src/main/java/io/swagger/model/pheno/ImageListResponse.java b/src/main/java/io/swagger/model/pheno/ImageListResponse.java
index f0dba456..ea0a3942 100644
--- a/src/main/java/io/swagger/model/pheno/ImageListResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ImageListResponse.java
@@ -19,7 +19,7 @@
  * ImageListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ImageListResponse implements BrAPIResponse<ImageListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ImageListResponseResult.java b/src/main/java/io/swagger/model/pheno/ImageListResponseResult.java
index 1aef808d..85d2f5a8 100644
--- a/src/main/java/io/swagger/model/pheno/ImageListResponseResult.java
+++ b/src/main/java/io/swagger/model/pheno/ImageListResponseResult.java
@@ -17,7 +17,7 @@
  * ImageListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ImageListResponseResult implements BrAPIResponseResult<Image>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/pheno/ImageNewRequest.java b/src/main/java/io/swagger/model/pheno/ImageNewRequest.java
index a74e10ef..2d009fab 100644
--- a/src/main/java/io/swagger/model/pheno/ImageNewRequest.java
+++ b/src/main/java/io/swagger/model/pheno/ImageNewRequest.java
@@ -22,7 +22,7 @@
  * ImageNewRequest
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ImageNewRequest   {
   @JsonProperty("additionalInfo")
   @Valid
diff --git a/src/main/java/io/swagger/model/pheno/ImageSingleResponse.java b/src/main/java/io/swagger/model/pheno/ImageSingleResponse.java
index ac700b83..39f5f2aa 100644
--- a/src/main/java/io/swagger/model/pheno/ImageSingleResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ImageSingleResponse.java
@@ -19,7 +19,7 @@
  * ImageSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ImageSingleResponse implements BrAPIResponse<Image>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/MethodListResponse.java b/src/main/java/io/swagger/model/pheno/MethodListResponse.java
index 081f7665..4737e8ab 100644
--- a/src/main/java/io/swagger/model/pheno/MethodListResponse.java
+++ b/src/main/java/io/swagger/model/pheno/MethodListResponse.java
@@ -18,7 +18,7 @@
  * MethodListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class MethodListResponse implements BrAPIResponse<MethodListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/MethodListResponseResult.java b/src/main/java/io/swagger/model/pheno/MethodListResponseResult.java
index 02b3a2ff..ecd34693 100644
--- a/src/main/java/io/swagger/model/pheno/MethodListResponseResult.java
+++ b/src/main/java/io/swagger/model/pheno/MethodListResponseResult.java
@@ -17,7 +17,7 @@
  * MethodListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class MethodListResponseResult implements BrAPIResponseResult<Method>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/pheno/MethodSingleResponse.java b/src/main/java/io/swagger/model/pheno/MethodSingleResponse.java
index e42d5dc5..41f23c4d 100644
--- a/src/main/java/io/swagger/model/pheno/MethodSingleResponse.java
+++ b/src/main/java/io/swagger/model/pheno/MethodSingleResponse.java
@@ -18,7 +18,7 @@
  * MethodSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class MethodSingleResponse implements BrAPIResponse<Method>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationLevelListResponse.java b/src/main/java/io/swagger/model/pheno/ObservationLevelListResponse.java
index 507b52d0..a0a860a9 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationLevelListResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationLevelListResponse.java
@@ -18,7 +18,7 @@
  * ObservationLevelListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationLevelListResponse implements BrAPIResponse<ObservationLevelListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationLevelListResponseResult.java b/src/main/java/io/swagger/model/pheno/ObservationLevelListResponseResult.java
index 3d2bcb90..8e729780 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationLevelListResponseResult.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationLevelListResponseResult.java
@@ -17,7 +17,7 @@
  * ObservationLevelListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationLevelListResponseResult implements BrAPIResponseResult<ObservationUnitHierarchyLevel>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/pheno/ObservationListResponse.java b/src/main/java/io/swagger/model/pheno/ObservationListResponse.java
index a19dbf8c..a6f98b70 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationListResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationListResponse.java
@@ -18,7 +18,7 @@
  * ObservationListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationListResponse implements BrAPIResponse<ObservationListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationListResponseResult.java b/src/main/java/io/swagger/model/pheno/ObservationListResponseResult.java
index 890ed560..2adb2a3e 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationListResponseResult.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationListResponseResult.java
@@ -17,7 +17,7 @@
  * ObservationListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationListResponseResult implements BrAPIResponseResult<Observation>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/pheno/ObservationSingleResponse.java b/src/main/java/io/swagger/model/pheno/ObservationSingleResponse.java
index 1b2fdfe0..4937edf2 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationSingleResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationSingleResponse.java
@@ -18,7 +18,7 @@
  * ObservationSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationSingleResponse implements BrAPIResponse<Observation>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationTable.java b/src/main/java/io/swagger/model/pheno/ObservationTable.java
index ace200b1..0704ddd9 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationTable.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationTable.java
@@ -15,7 +15,7 @@
  * ObservationTable
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationTable   {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/pheno/ObservationTableHeaderRowEnum.java b/src/main/java/io/swagger/model/pheno/ObservationTableHeaderRowEnum.java
index d12a0b9c..1cd1a92c 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationTableHeaderRowEnum.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationTableHeaderRowEnum.java
@@ -24,8 +24,7 @@ public enum ObservationTableHeaderRowEnum {
     BLOCK("block"),
     ENTRY("entry"),
     REP("rep");
-
-    private String value;
+private String value;
 
     ObservationTableHeaderRowEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationTableObservationVariables.java b/src/main/java/io/swagger/model/pheno/ObservationTableObservationVariables.java
index 04ddc0f9..ab029f44 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationTableObservationVariables.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationTableObservationVariables.java
@@ -11,7 +11,7 @@
  * ObservationTableObservationVariables
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationTableObservationVariables   {
   @JsonProperty("observationVariableDbId")
   private String observationVariableDbId = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationTableResponse.java b/src/main/java/io/swagger/model/pheno/ObservationTableResponse.java
index 2bc04594..fc8ac1f1 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationTableResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationTableResponse.java
@@ -18,7 +18,7 @@
  * ObservationTableResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationTableResponse implements BrAPIResponse<ObservationTable>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationTreatment.java b/src/main/java/io/swagger/model/pheno/ObservationTreatment.java
index ef5c2bfa..59028faf 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationTreatment.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationTreatment.java
@@ -11,7 +11,7 @@
  * ObservationTreatment
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationTreatment   {
   @JsonProperty("factor")
   private String factor = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationUnitHierarchyLevelEnum.java b/src/main/java/io/swagger/model/pheno/ObservationUnitHierarchyLevelEnum.java
index 4160eea2..7c910a5b 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationUnitHierarchyLevelEnum.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationUnitHierarchyLevelEnum.java
@@ -15,8 +15,7 @@ public enum ObservationUnitHierarchyLevelEnum {
     PLANT("plant"),
     POT("pot"),
     SAMPLE("sample");
-
-    private String value;
+private String value;
 
     ObservationUnitHierarchyLevelEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationUnitListResponse.java b/src/main/java/io/swagger/model/pheno/ObservationUnitListResponse.java
index d602b195..806613d9 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationUnitListResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationUnitListResponse.java
@@ -18,7 +18,7 @@
  * ObservationUnitListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationUnitListResponse implements BrAPIResponse<ObservationUnitListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationUnitListResponseResult.java b/src/main/java/io/swagger/model/pheno/ObservationUnitListResponseResult.java
index 52cfa925..a4dda423 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationUnitListResponseResult.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationUnitListResponseResult.java
@@ -17,7 +17,7 @@
  * ObservationUnitListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationUnitListResponseResult implements BrAPIResponseResult<ObservationUnit>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/pheno/ObservationUnitSingleResponse.java b/src/main/java/io/swagger/model/pheno/ObservationUnitSingleResponse.java
index 7f18be03..1de054fd 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationUnitSingleResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationUnitSingleResponse.java
@@ -18,7 +18,7 @@
  * ObservationUnitSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationUnitSingleResponse implements BrAPIResponse<ObservationUnit>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationUnitTable.java b/src/main/java/io/swagger/model/pheno/ObservationUnitTable.java
index 89757452..e89a76a9 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationUnitTable.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationUnitTable.java
@@ -15,7 +15,7 @@
  * ObservationUnitTable
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationUnitTable   {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/pheno/ObservationUnitTableResponse.java b/src/main/java/io/swagger/model/pheno/ObservationUnitTableResponse.java
index bfdbd4cb..ec4547d0 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationUnitTableResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationUnitTableResponse.java
@@ -18,7 +18,7 @@
  * ObservationUnitTableResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationUnitTableResponse implements BrAPIResponse<ObservationUnitTable>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationVariable.java b/src/main/java/io/swagger/model/pheno/ObservationVariable.java
index b314959a..d1938816 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationVariable.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationVariable.java
@@ -13,7 +13,7 @@
  * ObservationVariable
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationVariable extends VariableBaseClass  {
   @JsonProperty("observationVariableDbId")
   private String observationVariableDbId = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationVariableListResponse.java b/src/main/java/io/swagger/model/pheno/ObservationVariableListResponse.java
index 2cfba106..271b276c 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationVariableListResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationVariableListResponse.java
@@ -18,7 +18,7 @@
  * ObservationVariableListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationVariableListResponse implements BrAPIResponse<ObservationVariableListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationVariableListResponseResult.java b/src/main/java/io/swagger/model/pheno/ObservationVariableListResponseResult.java
index a8f7dcb1..1c430e91 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationVariableListResponseResult.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationVariableListResponseResult.java
@@ -17,7 +17,7 @@
  * ObservationVariableListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationVariableListResponseResult implements BrAPIResponseResult<ObservationVariable>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/pheno/ObservationVariableNewRequest.java b/src/main/java/io/swagger/model/pheno/ObservationVariableNewRequest.java
index e5b87a56..c6ecfeaa 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationVariableNewRequest.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationVariableNewRequest.java
@@ -12,7 +12,7 @@
  * ObservationVariableNewRequest
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationVariableNewRequest extends VariableBaseClass {
 	@JsonProperty("observationVariableName")
 	private Optional<String> observationVariableName = null;
diff --git a/src/main/java/io/swagger/model/pheno/ObservationVariableSingleResponse.java b/src/main/java/io/swagger/model/pheno/ObservationVariableSingleResponse.java
index 29a7e256..604bd802 100644
--- a/src/main/java/io/swagger/model/pheno/ObservationVariableSingleResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ObservationVariableSingleResponse.java
@@ -18,7 +18,7 @@
  * ObservationVariableSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ObservationVariableSingleResponse implements BrAPIResponse<ObservationVariable>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/OntologyListResponse.java b/src/main/java/io/swagger/model/pheno/OntologyListResponse.java
index 38e2d796..2a02a227 100644
--- a/src/main/java/io/swagger/model/pheno/OntologyListResponse.java
+++ b/src/main/java/io/swagger/model/pheno/OntologyListResponse.java
@@ -18,7 +18,7 @@
  * OntologyListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class OntologyListResponse implements BrAPIResponse<OntologyListResponseResult>  {
   @JsonProperty("@context")
   private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/OntologyListResponseResult.java b/src/main/java/io/swagger/model/pheno/OntologyListResponseResult.java
index d1fa2467..031508c8 100644
--- a/src/main/java/io/swagger/model/pheno/OntologyListResponseResult.java
+++ b/src/main/java/io/swagger/model/pheno/OntologyListResponseResult.java
@@ -17,7 +17,7 @@
  * OntologyListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class OntologyListResponseResult implements BrAPIResponseResult<Ontology>  {
   @JsonProperty("data")
   @Valid
diff --git a/src/main/java/io/swagger/model/pheno/PositionCoordinateTypeEnum.java b/src/main/java/io/swagger/model/pheno/PositionCoordinateTypeEnum.java
index dfdcf17e..6127a981 100644
--- a/src/main/java/io/swagger/model/pheno/PositionCoordinateTypeEnum.java
+++ b/src/main/java/io/swagger/model/pheno/PositionCoordinateTypeEnum.java
@@ -12,8 +12,7 @@ public enum PositionCoordinateTypeEnum {
     GRID_COL("GRID_COL"),
     MEASURED_ROW("MEASURED_ROW"),
     MEASURED_COL("MEASURED_COL");
-
-    private String value;
+private String value;
 
     PositionCoordinateTypeEnum(String value) {
       this.value = value;
diff --git a/src/main/java/io/swagger/model/pheno/ScaleBaseClassValidValuesCategories.java b/src/main/java/io/swagger/model/pheno/ScaleBaseClassValidValuesCategories.java
index e1dbfcbd..a174cec5 100644
--- a/src/main/java/io/swagger/model/pheno/ScaleBaseClassValidValuesCategories.java
+++ b/src/main/java/io/swagger/model/pheno/ScaleBaseClassValidValuesCategories.java
@@ -11,7 +11,7 @@
  * ScaleBaseClassValidValuesCategories
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 public class ScaleBaseClassValidValuesCategories   {
   @JsonProperty("label")
   private String label = null;
diff --git a/src/main/java/io/swagger/model/pheno/ScaleListResponse.java b/src/main/java/io/swagger/model/pheno/ScaleListResponse.java
index c735217e..798af72a 100644
--- a/src/main/java/io/swagger/model/pheno/ScaleListResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ScaleListResponse.java
@@ -17,7 +17,7 @@
  * ScaleListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ScaleListResponse implements BrAPIResponse<ScaleListResponseResult> {
 	@JsonProperty("@context")
 	private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/ScaleListResponseResult.java b/src/main/java/io/swagger/model/pheno/ScaleListResponseResult.java
index 9c3227ef..7a6d6241 100644
--- a/src/main/java/io/swagger/model/pheno/ScaleListResponseResult.java
+++ b/src/main/java/io/swagger/model/pheno/ScaleListResponseResult.java
@@ -16,7 +16,7 @@
  * ScaleListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ScaleListResponseResult implements BrAPIResponseResult<Scale> {
 	@JsonProperty("data")
 	@Valid
diff --git a/src/main/java/io/swagger/model/pheno/ScaleSingleResponse.java b/src/main/java/io/swagger/model/pheno/ScaleSingleResponse.java
index 90427267..e49bc821 100644
--- a/src/main/java/io/swagger/model/pheno/ScaleSingleResponse.java
+++ b/src/main/java/io/swagger/model/pheno/ScaleSingleResponse.java
@@ -17,7 +17,7 @@
  * ScaleSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class ScaleSingleResponse implements BrAPIResponse<Scale> {
 	@JsonProperty("@context")
 	private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/TraitListResponse.java b/src/main/java/io/swagger/model/pheno/TraitListResponse.java
index b4ba0418..dcfbfbe6 100644
--- a/src/main/java/io/swagger/model/pheno/TraitListResponse.java
+++ b/src/main/java/io/swagger/model/pheno/TraitListResponse.java
@@ -16,7 +16,7 @@
  * TraitListResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class TraitListResponse implements BrAPIResponse<TraitListResponseResult> {
 	@JsonProperty("@context")
 	private Context _atContext = null;
diff --git a/src/main/java/io/swagger/model/pheno/TraitListResponseResult.java b/src/main/java/io/swagger/model/pheno/TraitListResponseResult.java
index dfc90087..0729d102 100644
--- a/src/main/java/io/swagger/model/pheno/TraitListResponseResult.java
+++ b/src/main/java/io/swagger/model/pheno/TraitListResponseResult.java
@@ -16,7 +16,7 @@
  * TraitListResponseResult
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class TraitListResponseResult implements BrAPIResponseResult<Trait> {
 	@JsonProperty("data")
 	@Valid
diff --git a/src/main/java/io/swagger/model/pheno/TraitSingleResponse.java b/src/main/java/io/swagger/model/pheno/TraitSingleResponse.java
index 16157708..b3cbd6b6 100644
--- a/src/main/java/io/swagger/model/pheno/TraitSingleResponse.java
+++ b/src/main/java/io/swagger/model/pheno/TraitSingleResponse.java
@@ -16,7 +16,7 @@
  * TraitSingleResponse
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 public class TraitSingleResponse implements BrAPIResponse<Trait> {
 	@JsonProperty("@context")
 	private Context _atContext = null;
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/BrapiExceptionHandler.java b/src/main/java/org/brapi/test/BrAPITestServer/BrapiExceptionHandler.java
index 97998328..7ee15a60 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/BrapiExceptionHandler.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/BrapiExceptionHandler.java
@@ -26,13 +26,11 @@ public class BrapiExceptionHandler extends ResponseEntityExceptionHandler {
 
 	private static final Logger log = LoggerFactory.getLogger(BrapiExceptionHandler.class);
 
-	@Override
 	protected ResponseEntity<Object> handleMissingServletRequestParameter(MissingServletRequestParameterException ex,
 			HttpHeaders headers, HttpStatus status, WebRequest request) {
 		return buildErrorResponse(HttpStatus.BAD_REQUEST, ex.getParameterName() + " parameter is missing");
 	}
 
-	@Override
 	protected ResponseEntity<Object> handleExceptionInternal(Exception ex, @Nullable Object body, HttpHeaders headers,
 			HttpStatus status, WebRequest request) {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/auth/BrapiTestServerAuthConfig.java b/src/main/java/org/brapi/test/BrAPITestServer/auth/BrapiTestServerAuthConfig.java
index 445ae805..a84336fe 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/auth/BrapiTestServerAuthConfig.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/auth/BrapiTestServerAuthConfig.java
@@ -1,38 +1,50 @@
 package org.brapi.test.BrAPITestServer.auth;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
 @EnableWebSecurity 
-@EnableGlobalMethodSecurity(prePostEnabled=true)
-public class BrapiTestServerAuthConfig extends WebSecurityConfigurerAdapter{
+@EnableMethodSecurity
+public class BrapiTestServerAuthConfig {
 
 	@Value( "${security.oidc_discovery_url}" )
 	private String oidcDiscoveryUrl;
 
-    @Value("${security.issuer_url}")
-    private String issuerUrl;
+    @Value("${security.issuer_url}")private String issuerUrl;
 	
 	@Value( "${security.enabled:true}" )
 	private boolean authEnabled;
-	
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable().authorizeRequests()
+
+    @Bean
+    AuthenticationManager authenticationManager(AuthenticationConfiguration authenticationConfiguration) throws Exception {
+        return authenticationConfiguration.getAuthenticationManager();
+    }
+
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http, AuthenticationManager authenticationManager) throws Exception {
+        http.csrf(CsrfConfigurer::disable)
+            .authorizeHttpRequests(auth -> auth
                 .anyRequest()
-                .permitAll().and() //TODO secure this
-                //.authenticated().and()
-                .addFilter(new BrapiTestServerJWTAuthFilter(authenticationManager(),
-                        oidcDiscoveryUrl,
-                        issuerUrl,
-                        authEnabled))
+                .permitAll() //TODO: secure this
+            )    //.authenticated().and()
+            .addFilter(new BrapiTestServerJWTAuthFilter(
+                    authenticationManager,
+                    oidcDiscoveryUrl,
+                    issuerUrl,
+                    authEnabled))
                 // this disables session creation on Spring Security
-                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+            .sessionManagement(sm -> sm
+                    .sessionCreationPolicy(SessionCreationPolicy.STATELESS));
+        return http.build();
     }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/auth/BrapiTestServerJWTAuthFilter.java b/src/main/java/org/brapi/test/BrAPITestServer/auth/BrapiTestServerJWTAuthFilter.java
index 9bf65b01..566ea526 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/auth/BrapiTestServerJWTAuthFilter.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/auth/BrapiTestServerJWTAuthFilter.java
@@ -13,10 +13,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/auth/oldTokens/TokenController.java b/src/main/java/org/brapi/test/BrAPITestServer/auth/oldTokens/TokenController.java
index cfd73606..773e82cc 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/auth/oldTokens/TokenController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/auth/oldTokens/TokenController.java
@@ -19,9 +19,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Controller
 public class TokenController extends BrAPIController {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/BrAPIController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/BrAPIController.java
index 2f914581..f165a43f 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/BrAPIController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/BrAPIController.java
@@ -5,7 +5,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.brapi.test.BrAPITestServer.auth.AuthDetails;
 import org.brapi.test.BrAPITestServer.exceptions.BrAPIServerException;
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/CommonCropNamesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/CommonCropNamesApiController.java
index dda2d89b..bd0b973a 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/CommonCropNamesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/CommonCropNamesApiController.java
@@ -17,7 +17,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import jakarta.validation.Valid;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Controller
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ListsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ListsApiController.java
index d3f9911b..420e1b3b 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ListsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ListsApiController.java
@@ -29,12 +29,12 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import jakarta.validation.Valid;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Controller
 public class ListsApiController extends BrAPIController implements ListsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/LocationsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/LocationsApiController.java
index 4c9f01b3..b8c1c536 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/LocationsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/LocationsApiController.java
@@ -25,10 +25,10 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import jakarta.validation.Valid;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Controller
 public class LocationsApiController extends BrAPIController implements LocationsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/PeopleApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/PeopleApiController.java
index 7d27cfbc..cd973573 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/PeopleApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/PeopleApiController.java
@@ -25,10 +25,10 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import jakarta.validation.Valid;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Controller
 public class PeopleApiController extends BrAPIController implements PeopleApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ProgramsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ProgramsApiController.java
index 941a6740..32578cec 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ProgramsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ProgramsApiController.java
@@ -24,10 +24,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Controller
 public class ProgramsApiController extends BrAPIController implements ProgramsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/SeasonsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/SeasonsApiController.java
index ee5edbe1..3916a7df 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/SeasonsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/SeasonsApiController.java
@@ -19,10 +19,10 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import jakarta.validation.Valid;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Controller
 public class SeasonsApiController extends BrAPIController implements SeasonsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ServerInfoApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ServerInfoApiController.java
index 2e496ce8..761bd2a0 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ServerInfoApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/ServerInfoApiController.java
@@ -14,9 +14,9 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Controller
 public class ServerInfoApiController extends BrAPIController implements ServerInfoApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/StudiesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/StudiesApiController.java
index 5e6777d5..0c804e3f 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/StudiesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/StudiesApiController.java
@@ -28,11 +28,11 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import jakarta.validation.Valid;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Controller
 public class StudiesApiController extends BrAPIController implements StudiesApi, StudytypesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/TrialsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/TrialsApiController.java
index 37654e61..34889ccc 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/core/TrialsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/core/TrialsApiController.java
@@ -31,10 +31,10 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import jakarta.validation.Valid;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Controller
 public class TrialsApiController extends BrAPIController implements TrialsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/AlleleMatrixApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/AlleleMatrixApiController.java
index 1e9af2d3..a463606e 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/AlleleMatrixApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/AlleleMatrixApiController.java
@@ -1,6 +1,6 @@
 package org.brapi.test.BrAPITestServer.controller.geno;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.brapi.test.BrAPITestServer.controller.core.BrAPIController;
 import org.brapi.test.BrAPITestServer.exceptions.BrAPIServerException;
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/CallSetsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/CallSetsApiController.java
index a326d474..a71682ef 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/CallSetsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/CallSetsApiController.java
@@ -28,10 +28,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class CallSetsApiController extends BrAPIController implements CallSetsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/CallsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/CallsApiController.java
index 89c25573..570b0f96 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/CallsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/CallsApiController.java
@@ -28,9 +28,9 @@
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class CallsApiController extends BrAPIController implements CallsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/MapsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/MapsApiController.java
index 57283681..9276e35a 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/MapsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/MapsApiController.java
@@ -23,10 +23,10 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class MapsApiController extends BrAPIController implements MapsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/MarkerPositionsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/MarkerPositionsApiController.java
index bfdf1ff3..d73a6048 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/MarkerPositionsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/MarkerPositionsApiController.java
@@ -24,10 +24,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class MarkerPositionsApiController extends BrAPIController implements MarkerPositionsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/PlatesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/PlatesApiController.java
index cef02bbf..19ba2dd2 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/PlatesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/PlatesApiController.java
@@ -26,11 +26,11 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class PlatesApiController extends BrAPIController implements PlatesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/ReferenceSetsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/ReferenceSetsApiController.java
index a8bb7774..1fd5703c 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/ReferenceSetsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/ReferenceSetsApiController.java
@@ -25,10 +25,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class ReferenceSetsApiController extends BrAPIController implements ReferenceSetsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/ReferencesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/ReferencesApiController.java
index 415af672..84133064 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/ReferencesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/ReferencesApiController.java
@@ -27,10 +27,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class ReferencesApiController extends BrAPIController implements ReferencesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/SamplesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/SamplesApiController.java
index 231023cb..9b0afb4d 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/SamplesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/SamplesApiController.java
@@ -26,11 +26,11 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class SamplesApiController extends BrAPIController implements SamplesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VariantSetsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VariantSetsApiController.java
index e96ac852..220132e2 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VariantSetsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VariantSetsApiController.java
@@ -37,10 +37,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class VariantSetsApiController extends BrAPIController implements VariantSetsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VariantsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VariantsApiController.java
index 968dacfa..4580b459 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VariantsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VariantsApiController.java
@@ -30,9 +30,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class VariantsApiController extends BrAPIController implements VariantsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VendorApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VendorApiController.java
index 9075c77a..e9e81582 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VendorApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/geno/VendorApiController.java
@@ -37,10 +37,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Controller
 public class VendorApiController extends BrAPIController implements VendorApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/AttributeValuesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/AttributeValuesApiController.java
index b2f44baa..ca0e970f 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/AttributeValuesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/AttributeValuesApiController.java
@@ -26,10 +26,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Controller
 public class AttributeValuesApiController extends BrAPIController implements AttributeValuesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/AttributesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/AttributesApiController.java
index 794d2103..d96f68be 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/AttributesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/AttributesApiController.java
@@ -27,10 +27,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Controller
 public class AttributesApiController extends BrAPIController implements AttributesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/BreedingMethodsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/BreedingMethodsApiController.java
index 310bfe54..4507adb8 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/BreedingMethodsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/BreedingMethodsApiController.java
@@ -18,10 +18,10 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Controller
 public class BreedingMethodsApiController extends BrAPIController implements BreedingMethodsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/CrossesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/CrossesApiController.java
index 0b967588..6c6ce32b 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/CrossesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/CrossesApiController.java
@@ -18,11 +18,11 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Controller
 public class CrossesApiController extends BrAPIController implements CrossesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/CrossingProjectsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/CrossingProjectsApiController.java
index dc26d757..393bf30c 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/CrossingProjectsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/CrossingProjectsApiController.java
@@ -20,10 +20,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Controller
 public class CrossingProjectsApiController extends BrAPIController implements CrossingProjectsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/GermplasmApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/GermplasmApiController.java
index 00b55718..325688c0 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/GermplasmApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/GermplasmApiController.java
@@ -33,12 +33,12 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import java.util.Arrays;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Controller
 public class GermplasmApiController extends BrAPIController implements GermplasmApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/PedigreeApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/PedigreeApiController.java
index 84a6b0bd..56fcbecb 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/PedigreeApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/PedigreeApiController.java
@@ -23,11 +23,11 @@
 import io.swagger.model.germ.PedigreeListResponseResult;
 import io.swagger.model.germ.PedigreeNode;
 import io.swagger.model.germ.PedigreeSearchRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-03T22:50:47.807Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-03T22:50:47.807Z[GMT]")
 @RestController
 public class PedigreeApiController extends BrAPIController implements PedigreeApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/PlannedCrossesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/PlannedCrossesApiController.java
index 83bf62c1..bdb646e1 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/PlannedCrossesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/PlannedCrossesApiController.java
@@ -18,11 +18,11 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Controller
 public class PlannedCrossesApiController extends BrAPIController implements PlannedCrossesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/SeedLotsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/SeedLotsApiController.java
index 9147ca44..c0efd679 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/SeedLotsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/germ/SeedLotsApiController.java
@@ -24,10 +24,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Controller
 public class SeedLotsApiController extends BrAPIController implements SeedLotsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/EventsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/EventsApiController.java
index bde14b93..8ce81c45 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/EventsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/EventsApiController.java
@@ -18,10 +18,10 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Controller
 public class EventsApiController extends BrAPIController implements EventsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ImagesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ImagesApiController.java
index eded75ce..5180b425 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ImagesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ImagesApiController.java
@@ -32,10 +32,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Controller
 public class ImagesApiController extends BrAPIController implements ImagesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/MethodsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/MethodsApiController.java
index d987e620..b485eb82 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/MethodsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/MethodsApiController.java
@@ -21,10 +21,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Controller
 public class MethodsApiController extends BrAPIController implements MethodsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ObservationUnitsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ObservationUnitsApiController.java
index d6642378..836b276c 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ObservationUnitsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ObservationUnitsApiController.java
@@ -33,12 +33,12 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Controller
 public class ObservationUnitsApiController extends BrAPIController
 		implements ObservationUnitsApi, ObservationLevelsApi {
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ObservationsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ObservationsApiController.java
index 055ca429..6d2cd74a 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ObservationsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ObservationsApiController.java
@@ -31,11 +31,11 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Controller
 public class ObservationsApiController extends BrAPIController implements ObservationsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/OntologiesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/OntologiesApiController.java
index cfd83c8d..9445d474 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/OntologiesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/OntologiesApiController.java
@@ -21,10 +21,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Controller
 public class OntologiesApiController extends BrAPIController implements OntologiesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ScalesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ScalesApiController.java
index b3951dfa..e5604847 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ScalesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/ScalesApiController.java
@@ -21,10 +21,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Controller
 public class ScalesApiController extends BrAPIController implements ScalesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/TraitsApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/TraitsApiController.java
index 6aa234e6..4b4c5429 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/TraitsApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/TraitsApiController.java
@@ -21,10 +21,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Controller
 public class TraitsApiController extends BrAPIController implements TraitsApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/VariablesApiController.java b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/VariablesApiController.java
index bc59e37c..29eff6e1 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/VariablesApiController.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/controller/pheno/VariablesApiController.java
@@ -26,10 +26,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:22.556Z[GMT]")
 @Controller
 public class VariablesApiController extends BrAPIController implements VariablesApi {
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/exceptions/ApiException.java b/src/main/java/org/brapi/test/BrAPITestServer/exceptions/ApiException.java
index 92a403f8..30f20f2e 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/exceptions/ApiException.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/exceptions/ApiException.java
@@ -1,6 +1,6 @@
 package org.brapi.test.BrAPITestServer.exceptions;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 public class ApiException extends Exception {
 	private static final long serialVersionUID = -2174637728997742359L;
 	private int code;
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/AdditionalInfoEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/AdditionalInfoEntity.java
index 33d21f2d..d6a38b94 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/AdditionalInfoEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/AdditionalInfoEntity.java
@@ -1,54 +1,52 @@
 package org.brapi.test.BrAPITestServer.model.entity;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import java.io.*;
 
 @Entity
-@Table(name="additional_info")
-public class AdditionalInfoEntity extends BrAPIBaseEntity{
-	@Column
-	private String key;
-	@Column
-	private byte[] value;
-	
-	public String getKey() {
-		return key;
-	}
-	public void setKey(String key) {
-		this.key = key;
-	}
-	public Object getValue() {
-		ByteArrayInputStream bais = new ByteArrayInputStream(value);
-		Object obj = null;
-		try {
-			ObjectInputStream ois = new ObjectInputStream(bais);
-			obj = ois.readObject();
-		} catch (IOException | ClassNotFoundException e) {
-			e.printStackTrace();
-		}
-		
-		return obj;
-	}
-	public void setValue(Object value) {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		try {
-			ObjectOutputStream oos = new ObjectOutputStream(baos);
-			oos.writeObject(value);
-			oos.flush();
-			oos.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		this.value = baos.toByteArray();
-	}
-	
-	
+@Table(name = "additional_info")
+public class AdditionalInfoEntity extends BrAPIBaseEntity {
+    @Column
+    private String key;
+    @Column
+    private byte[] value;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public Object getValue() {
+        ByteArrayInputStream bais = new ByteArrayInputStream(value);
+        Object obj = null;
+        try {
+            ObjectInputStream ois = new ObjectInputStream(bais);
+            obj = ois.readObject();
+        } catch (IOException | ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        return obj;
+    }
+
+    public void setValue(Object value) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try {
+            ObjectOutputStream oos = new ObjectOutputStream(baos);
+            oos.writeObject(value);
+            oos.flush();
+            oos.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        this.value = baos.toByteArray();
+    }
+
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/BrAPIBaseEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/BrAPIBaseEntity.java
index 9100c91f..8d9c4626 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/BrAPIBaseEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/BrAPIBaseEntity.java
@@ -1,30 +1,23 @@
 package org.brapi.test.BrAPITestServer.model.entity;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.TypeDef;
-import org.hibernate.type.TextType;
 
 @MappedSuperclass
-@TypeDef(
-	defaultForType = String.class,
-	typeClass = TextType.class
-)
 public class BrAPIBaseEntity {
 
-	@Id
-	@GeneratedValue(generator = "uuid")
-	@GenericGenerator(name = "uuid", strategy = "uuid2")
-	private String id;
+    @Id
+    @GeneratedValue(generator = "uuid")
+    @GenericGenerator(name = "uuid", strategy = "uuid2")
+    private String id;
 
-	public String getId() {
-		return id;
-	}
+    public String getId() {
+        return id;
+    }
 
-	public void setId(String id) {
-		this.id = id;
-	}
+    public void setId(String id) {
+        this.id = id;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/BrAPIPrimaryEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/BrAPIPrimaryEntity.java
index d7b85f83..9e27cb95 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/BrAPIPrimaryEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/BrAPIPrimaryEntity.java
@@ -1,106 +1,100 @@
 package org.brapi.test.BrAPITestServer.model.entity;
 
+import io.swagger.model.ExternalReferences;
+import io.swagger.model.ExternalReferencesInner;
+import jakarta.persistence.*;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.MappedSuperclass;
-
-import io.swagger.model.ExternalReferences;
-import io.swagger.model.ExternalReferencesInner;
-
 @MappedSuperclass
 public class BrAPIPrimaryEntity extends BrAPIBaseEntity {
 
-	@ManyToMany(cascade = CascadeType.ALL)
-	@JoinTable(joinColumns = { @JoinColumn(referencedColumnName = "id") }, inverseJoinColumns = {
-			@JoinColumn(referencedColumnName = "id") })
-	private List<AdditionalInfoEntity> additionalInfo;
-
-	@ManyToMany(cascade = CascadeType.ALL)
-	@JoinTable(joinColumns = { @JoinColumn(referencedColumnName = "id") }, inverseJoinColumns = {
-			@JoinColumn(referencedColumnName = "id") })
-	private List<ExternalReferenceEntity> externalReferences;
-	
-	@Column
-	private String authUserId;
-
-	public String getAuthUserId() {
-		return authUserId;
-	}
-
-	public void setAuthUserId(String authUserId) {
-		this.authUserId = authUserId;
-	}
-
-	public List<AdditionalInfoEntity> getAdditionalInfo() {
-		return additionalInfo;
-	}
-
-	public void setAdditionalInfo(List<AdditionalInfoEntity> additionalInfo) {
-		this.additionalInfo = additionalInfo;
-	}
-
-	public Map<String, Object> getAdditionalInfoMap() {
-		Map<String, Object> info = new HashMap<>();
-		if (getAdditionalInfo() != null) {
-			for (AdditionalInfoEntity entity : getAdditionalInfo()) {
-				info.put(entity.getKey(), entity.getValue());
-			}
-		}
-		return info;
-	}
-
-	public void setAdditionalInfo(Map<String, Object> map) {
-		if (map != null) {
-			setAdditionalInfo(new ArrayList<>());
-			for (Entry<String, Object> entry : map.entrySet()) {
-				AdditionalInfoEntity entity = new AdditionalInfoEntity();
-				entity.setKey(entry.getKey());
-				entity.setValue(entry.getValue());
-				getAdditionalInfo().add(entity);
-			}
-		}
-	}
-
-	public List<ExternalReferenceEntity> getExternalReferences() {
-		return externalReferences;
-	}
-
-	public void setExternalReferences(List<ExternalReferenceEntity> externalReferences) {
-		this.externalReferences = externalReferences;
-	}
-
-	public ExternalReferences getExternalReferencesMap() {
-		ExternalReferences exRefs = new ExternalReferences();
-		if (getExternalReferences() != null) {
-			for (ExternalReferenceEntity entity : getExternalReferences()) {
-				ExternalReferencesInner exRef = new ExternalReferencesInner();
-				exRef.setReferenceID(entity.getExternalReferenceId());
-				exRef.setReferenceSource(entity.getExternalReferenceSource());
-				exRefs.add(exRef);
-			}
-		}
-		return exRefs;
-	}
-
-	public void setExternalReferences(ExternalReferences exRefs) {
-		if (exRefs != null) {
-			setExternalReferences(new ArrayList<>());
-			for (ExternalReferencesInner exRef : exRefs) {
-				ExternalReferenceEntity entity = new ExternalReferenceEntity();
-				entity.setExternalReferenceId(exRef.getReferenceID());
-				entity.setExternalReferenceSource(exRef.getReferenceSource());
-				getExternalReferences().add(entity);
-			}
-		}
-	}
+    @ManyToMany(cascade = CascadeType.ALL)
+    @JoinTable(joinColumns = {@JoinColumn(referencedColumnName = "id")}, inverseJoinColumns = {
+            @JoinColumn(referencedColumnName = "id")})
+    private List<AdditionalInfoEntity> additionalInfo;
+
+    @ManyToMany(cascade = CascadeType.ALL)
+    @JoinTable(joinColumns = {@JoinColumn(referencedColumnName = "id")}, inverseJoinColumns = {
+            @JoinColumn(referencedColumnName = "id")})
+    private List<ExternalReferenceEntity> externalReferences;
+
+    @Column
+    private String authUserId;
+
+    public String getAuthUserId() {
+        return authUserId;
+    }
+
+    public void setAuthUserId(String authUserId) {
+        this.authUserId = authUserId;
+    }
+
+    public List<AdditionalInfoEntity> getAdditionalInfo() {
+        return additionalInfo;
+    }
+
+    public void setAdditionalInfo(List<AdditionalInfoEntity> additionalInfo) {
+        this.additionalInfo = additionalInfo;
+    }
+
+    public Map<String, Object> getAdditionalInfoMap() {
+        Map<String, Object> info = new HashMap<>();
+        if (getAdditionalInfo() != null) {
+            for (AdditionalInfoEntity entity : getAdditionalInfo()) {
+                info.put(entity.getKey(), entity.getValue());
+            }
+        }
+        return info;
+    }
+
+    public void setAdditionalInfo(Map<String, Object> map) {
+        if (map != null) {
+            setAdditionalInfo(new ArrayList<>());
+            for (Entry<String, Object> entry : map.entrySet()) {
+                AdditionalInfoEntity entity = new AdditionalInfoEntity();
+                entity.setKey(entry.getKey());
+                entity.setValue(entry.getValue());
+                getAdditionalInfo().add(entity);
+            }
+        }
+    }
+
+    public List<ExternalReferenceEntity> getExternalReferences() {
+        return externalReferences;
+    }
+
+    public void setExternalReferences(List<ExternalReferenceEntity> externalReferences) {
+        this.externalReferences = externalReferences;
+    }
+
+    public ExternalReferences getExternalReferencesMap() {
+        ExternalReferences exRefs = new ExternalReferences();
+        if (getExternalReferences() != null) {
+            for (ExternalReferenceEntity entity : getExternalReferences()) {
+                ExternalReferencesInner exRef = new ExternalReferencesInner();
+                exRef.setReferenceID(entity.getExternalReferenceId());
+                exRef.setReferenceSource(entity.getExternalReferenceSource());
+                exRefs.add(exRef);
+            }
+        }
+        return exRefs;
+    }
+
+    public void setExternalReferences(ExternalReferences exRefs) {
+        if (exRefs != null) {
+            setExternalReferences(new ArrayList<>());
+            for (ExternalReferencesInner exRef : exRefs) {
+                ExternalReferenceEntity entity = new ExternalReferenceEntity();
+                entity.setExternalReferenceId(exRef.getReferenceID());
+                entity.setExternalReferenceSource(exRef.getReferenceSource());
+                getExternalReferences().add(entity);
+            }
+        }
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/CoordinateEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/CoordinateEntity.java
index 7dfe63a5..c2983189 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/CoordinateEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/CoordinateEntity.java
@@ -1,45 +1,53 @@
 package org.brapi.test.BrAPITestServer.model.entity;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
 import java.math.BigDecimal;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
 
 @Entity
-@Table(name="coordinate")
-public class CoordinateEntity extends BrAPIBaseEntity{
-	@Column(precision = 9, scale = 6)
-	private BigDecimal longitude;
-	@Column(precision = 9, scale = 6)
-	private BigDecimal latitude;
-	@Column(precision = 9, scale = 6)
-	private BigDecimal altitude;
-	@ManyToOne
-	private GeoJSONEntity geoJSON;
-	
-	public GeoJSONEntity getGeoJSON() {
-		return geoJSON;
-	}
-	public void setGeoJSON(GeoJSONEntity geoJSON) {
-		this.geoJSON = geoJSON;
-	}
-	public BigDecimal getLongitude() {
-		return longitude;
-	}
-	public void setLongitude(BigDecimal longitude) {
-		this.longitude = longitude;
-	}
-	public BigDecimal getLatitude() {
-		return latitude;
-	}
-	public void setLatitude(BigDecimal latitude) {
-		this.latitude = latitude;
-	}
-	public BigDecimal getAltitude() {
-		return altitude;
-	}
-	public void setAltitude(BigDecimal altitude) {
-		this.altitude = altitude;
-	}
+@Table(name = "coordinate")
+public class CoordinateEntity extends BrAPIBaseEntity {
+    @Column(precision = 9, scale = 6)
+    private BigDecimal longitude;
+    @Column(precision = 9, scale = 6)
+    private BigDecimal latitude;
+    @Column(precision = 9, scale = 6)
+    private BigDecimal altitude;
+    @ManyToOne
+    private GeoJSONEntity geoJSON;
+
+    public GeoJSONEntity getGeoJSON() {
+        return geoJSON;
+    }
+
+    public void setGeoJSON(GeoJSONEntity geoJSON) {
+        this.geoJSON = geoJSON;
+    }
+
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getAltitude() {
+        return altitude;
+    }
+
+    public void setAltitude(BigDecimal altitude) {
+        this.altitude = altitude;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/ExternalReferenceEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/ExternalReferenceEntity.java
index d62a22a6..49a9a0d5 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/ExternalReferenceEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/ExternalReferenceEntity.java
@@ -1,27 +1,31 @@
 package org.brapi.test.BrAPITestServer.model.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 @Entity
-@Table(name="external_reference")
-public class ExternalReferenceEntity extends BrAPIBaseEntity{
-	@Column
-	private String externalReferenceId;
-	@Column
-	private String externalReferenceSource;
-	public String getExternalReferenceId() {
-		return externalReferenceId;
-	}
-	public void setExternalReferenceId(String externalReferenceId) {
-		this.externalReferenceId = externalReferenceId;
-	}
-	public String getExternalReferenceSource() {
-		return externalReferenceSource;
-	}
-	public void setExternalReferenceSource(String externalReferenceSource) {
-		this.externalReferenceSource = externalReferenceSource;
-	}
-	
+@Table(name = "external_reference")
+public class ExternalReferenceEntity extends BrAPIBaseEntity {
+    @Column
+    private String externalReferenceId;
+    @Column
+    private String externalReferenceSource;
+
+    public String getExternalReferenceId() {
+        return externalReferenceId;
+    }
+
+    public void setExternalReferenceId(String externalReferenceId) {
+        this.externalReferenceId = externalReferenceId;
+    }
+
+    public String getExternalReferenceSource() {
+        return externalReferenceSource;
+    }
+
+    public void setExternalReferenceSource(String externalReferenceSource) {
+        this.externalReferenceSource = externalReferenceSource;
+    }
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/GeoJSONEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/GeoJSONEntity.java
index 4231ed81..d1831651 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/GeoJSONEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/GeoJSONEntity.java
@@ -1,38 +1,38 @@
 package org.brapi.test.BrAPITestServer.model.entity;
 
+import jakarta.persistence.*;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
 @Entity
-@Table(name="geojson")
-public class GeoJSONEntity extends BrAPIBaseEntity{	
-	@Column
-	private String type;
-	@OneToMany(mappedBy="geoJSON", cascade = CascadeType.ALL)
-	private List<CoordinateEntity> coordinates;
-	
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	public List<CoordinateEntity> getCoordinates() {
-		return coordinates;
-	}
-	public void setCoordinates(List<CoordinateEntity> coordinates) {
-		this.coordinates = coordinates;
-	}
-	public void addCoordinate(CoordinateEntity coordinate) {
-		if(this.coordinates == null) {
-			this.coordinates = new ArrayList<>();
-		}
-		this.coordinates.add(coordinate);
-	}
+@Table(name = "geojson")
+public class GeoJSONEntity extends BrAPIBaseEntity {
+    @Column
+    private String type;
+    @OneToMany(mappedBy = "geoJSON", cascade = CascadeType.ALL)
+    private List<CoordinateEntity> coordinates;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public List<CoordinateEntity> getCoordinates() {
+        return coordinates;
+    }
+
+    public void setCoordinates(List<CoordinateEntity> coordinates) {
+        this.coordinates = coordinates;
+    }
+
+    public void addCoordinate(CoordinateEntity coordinate) {
+        if (this.coordinates == null) {
+            this.coordinates = new ArrayList<>();
+        }
+        this.coordinates.add(coordinate);
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/SearchRequestEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/SearchRequestEntity.java
index 29d001b2..9375c046 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/SearchRequestEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/SearchRequestEntity.java
@@ -1,66 +1,67 @@
 package org.brapi.test.BrAPITestServer.model.entity;
 
-import java.io.IOException;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.exceptions.BrAPIServerException;
+import org.hibernate.annotations.JdbcType;
+import org.hibernate.type.descriptor.jdbc.LongVarcharJdbcType;
 import org.springframework.http.HttpStatus;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 
 @Entity
-@Table(name="search")
+@Table(name = "search")
 public class SearchRequestEntity extends BrAPIPrimaryEntity {
-	@Column
-	private SearchRequestTypes requestType;
-	@Column
-	private Integer responseCountdown;
-	@Lob
-	private String parameters;
-	
-	public SearchRequestTypes getRequestType() {
-		return requestType;
-	}
-	
-	public void setRequestType(SearchRequestTypes requestType) {
-		this.requestType = requestType;
-	}
+    @Column
+    private SearchRequestTypes requestType;
+    @Column
+    private Integer responseCountdown;
+    @JdbcType(LongVarcharJdbcType.class)
+    private String parameters;
+
+    public SearchRequestTypes getRequestType() {
+        return requestType;
+    }
+
+    public void setRequestType(SearchRequestTypes requestType) {
+        this.requestType = requestType;
+    }
+
+    public Integer getResponseCountdown() {
+        return responseCountdown;
+    }
+
+    public void setResponseCountdown(Integer responseCountdown) {
+        this.responseCountdown = responseCountdown;
+    }
+
+    public String getParametersStr() {
+        return parameters;
+    }
+
+    public <T> T getParameters(Class<T> clazz) throws BrAPIServerException {
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            return mapper.readValue(parameters, clazz);
+        } catch (IOException e) {
+            throw new BrAPIServerException(HttpStatus.BAD_REQUEST, "Could not de-serialize search request. Please POST request again.");
+        }
+    }
+
+    public void setParameters(Object parameters) throws BrAPIServerException {
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            this.parameters = mapper.writeValueAsString(parameters);
+        } catch (JsonProcessingException e) {
+            throw new BrAPIServerException(HttpStatus.BAD_REQUEST, "Could not serialize request. Please POST request again.");
+        }
+    }
 
-	public Integer getResponseCountdown() {
-		return responseCountdown;
-	}
+    public enum SearchRequestTypes {CALLS, CALLSETS, MARKER_POSITIONS, REFERENCES, REFERENCESETS, VARIANTS, VARIANTSETS, GERMPLASM, GERMPLASM_ATTRIBUTES, GERMPLASM_ATTRIBUTE_VALUES, IMAGES, LISTS, LOCATIONS, MARKERS, OBSERVATIONS, OBSERVATION_TABLES, OBSERVATION_UNITS, PEOPLE, PEDIGREE, PROGRAMS, SAMPLES, STUDIES, TRIALS, VARIABLES}
 
-	public void setResponseCountdown(Integer responseCountdown) {
-		this.responseCountdown = responseCountdown;
-	}
+    ;
 
-	public String getParametersStr() {
-		return parameters;
-	}
-	
-	public <T> T getParameters(Class<T> clazz) throws BrAPIServerException {
-		ObjectMapper mapper = new ObjectMapper();
-		try {
-			return mapper.readValue(parameters, clazz);
-		} catch (IOException e) {
-			throw new BrAPIServerException(HttpStatus.BAD_REQUEST, "Could not de-serialize search request. Please POST request again.");
-		}
-	}
-	
-	public void setParameters(Object parameters) throws BrAPIServerException {
-		ObjectMapper mapper = new ObjectMapper();
-		try {
-			this.parameters = mapper.writeValueAsString(parameters);
-		} catch (JsonProcessingException e) {
-			throw new BrAPIServerException(HttpStatus.BAD_REQUEST, "Could not serialize request. Please POST request again.");
-		}
-	}
-	
-	public enum SearchRequestTypes {CALLS, CALLSETS, MARKER_POSITIONS, REFERENCES, REFERENCESETS, VARIANTS, VARIANTSETS, GERMPLASM, GERMPLASM_ATTRIBUTES, GERMPLASM_ATTRIBUTE_VALUES, IMAGES, LISTS, LOCATIONS, MARKERS, OBSERVATIONS, OBSERVATION_TABLES, OBSERVATION_UNITS, PEOPLE, PEDIGREE, PROGRAMS, SAMPLES, STUDIES, TRIALS, VARIABLES};
-	
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ContactEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ContactEntity.java
index c4a7e553..d681e7c3 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ContactEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ContactEntity.java
@@ -1,63 +1,73 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
-@Table(name="contact")
-public class ContactEntity extends BrAPIBaseEntity{
-	@Column
-	private String studyDbId;
-	@Column
-	private String trialDbId;
-	@Column
-	private String name;
-	@Column
-	private String instituteName;
-	@Column
-	private String email;
-	@Column
-	private String type;
-	@Column
-	private String orcid;
-	
-	public String getStudyDbId() {
-		return studyDbId;
-	}
-	public void setStudyDbId(String studyDbId) {
-		this.studyDbId = studyDbId;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getInstituteName() {
-		return instituteName;
-	}
-	public void setInstituteName(String instituteName) {
-		this.instituteName = instituteName;
-	}
-	public String getEmail() {
-		return email;
-	}
-	public void setEmail(String email) {
-		this.email = email;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	public String getOrcid() {
-		return orcid;
-	}
-	public void setOrcid(String orcid) {
-		this.orcid = orcid;
-	}
+@Table(name = "contact")
+public class ContactEntity extends BrAPIBaseEntity {
+    @Column
+    private String studyDbId;
+    @Column
+    private String trialDbId;
+    @Column
+    private String name;
+    @Column
+    private String instituteName;
+    @Column
+    private String email;
+    @Column
+    private String type;
+    @Column
+    private String orcid;
+
+    public String getStudyDbId() {
+        return studyDbId;
+    }
+
+    public void setStudyDbId(String studyDbId) {
+        this.studyDbId = studyDbId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getInstituteName() {
+        return instituteName;
+    }
+
+    public void setInstituteName(String instituteName) {
+        this.instituteName = instituteName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getOrcid() {
+        return orcid;
+    }
+
+    public void setOrcid(String orcid) {
+        this.orcid = orcid;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/CropEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/CropEntity.java
index 68e953f6..3ce8cc55 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/CropEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/CropEntity.java
@@ -1,79 +1,78 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
 
+import java.util.List;
+
 @Entity
-@Table(name="crop")
+@Table(name = "crop")
 public class CropEntity extends BrAPIPrimaryEntity {
-	@Column(name="crop_name")
-	private String cropName;
-	
-	@OneToMany(mappedBy="crop")
-	private List<ProgramEntity> program;
-	@OneToMany(mappedBy="crop")
-	private List<TrialEntity> trials;
-	@OneToMany(mappedBy="crop")
-	private List<StudyEntity> studies;
-	@OneToMany(mappedBy="crop")
-	private List<ObservationUnitEntity> observationUnits;
-	@OneToMany(mappedBy="crop")
-	private List<ObservationEntity> observations;
-
-	public List<ProgramEntity> getProgram() {
-		return program;
-	}
-
-	public void setProgram(List<ProgramEntity> program) {
-		this.program = program;
-	}
-
-	public List<TrialEntity> getTrials() {
-		return trials;
-	}
-
-	public void setTrials(List<TrialEntity> trials) {
-		this.trials = trials;
-	}
-
-	public List<StudyEntity> getStudies() {
-		return studies;
-	}
-
-	public void setStudies(List<StudyEntity> studies) {
-		this.studies = studies;
-	}
-
-	public List<ObservationUnitEntity> getObservationUnits() {
-		return observationUnits;
-	}
-
-	public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
-		this.observationUnits = observationUnits;
-	}
-
-	public List<ObservationEntity> getObservations() {
-		return observations;
-	}
-
-	public void setObservations(List<ObservationEntity> observations) {
-		this.observations = observations;
-	}
-
-	public String getCropName() {
-		return cropName;
-	}
-
-	public void setCropName(String cropName) {
-		this.cropName = cropName;
-	}
+    @Column(name = "crop_name")
+
+    private String cropName;
+
+    @OneToMany(mappedBy = "crop")
+    private List<ProgramEntity> program;
+    @OneToMany(mappedBy = "crop")
+    private List<TrialEntity> trials;
+    @OneToMany(mappedBy = "crop")
+    private List<StudyEntity> studies;
+    @OneToMany(mappedBy = "crop")
+    private List<ObservationUnitEntity> observationUnits;
+    @OneToMany(mappedBy = "crop")
+    private List<ObservationEntity> observations;
+
+    public List<ProgramEntity> getProgram() {
+        return program;
+    }
+
+    public void setProgram(List<ProgramEntity> program) {
+        this.program = program;
+    }
+
+    public List<TrialEntity> getTrials() {
+        return trials;
+    }
+
+    public void setTrials(List<TrialEntity> trials) {
+        this.trials = trials;
+    }
+
+    public List<StudyEntity> getStudies() {
+        return studies;
+    }
+
+    public void setStudies(List<StudyEntity> studies) {
+        this.studies = studies;
+    }
+
+    public List<ObservationUnitEntity> getObservationUnits() {
+        return observationUnits;
+    }
+
+    public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
+        this.observationUnits = observationUnits;
+    }
+
+    public List<ObservationEntity> getObservations() {
+        return observations;
+    }
+
+    public void setObservations(List<ObservationEntity> observations) {
+        this.observations = observations;
+    }
+
+    public String getCropName() {
+        return cropName;
+    }
+
+    public void setCropName(String cropName) {
+        this.cropName = cropName;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/DataLinkEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/DataLinkEntity.java
index e175434c..cd3ea8fc 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/DataLinkEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/DataLinkEntity.java
@@ -1,96 +1,95 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "study_data_link")
 public class DataLinkEntity extends BrAPIBaseEntity {
-	@Column
-	private String dataFormat;
-	@Column
-	private String description;
-	@Column
-	private String fileFormat;
-	@Column
-	private String name;
-	@Column
-	private String provenance;
-	@Column
-	private String scientificType;
-	@Column
-	private String url;
-	@Column
-	private String version;
-	@ManyToOne
-	private StudyEntity study;
-
-	public String getDataFormat() {
-		return dataFormat;
-	}
-
-	public void setDataFormat(String dataFormat) {
-		this.dataFormat = dataFormat;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getFileFormat() {
-		return fileFormat;
-	}
-
-	public void setFileFormat(String fileFormat) {
-		this.fileFormat = fileFormat;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getProvenance() {
-		return provenance;
-	}
-
-	public void setProvenance(String provenance) {
-		this.provenance = provenance;
-	}
-
-	public String getScientificType() {
-		return scientificType;
-	}
-
-	public void setScientificType(String scientificType) {
-		this.scientificType = scientificType;
-	}
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
+    @Column
+    private String dataFormat;
+    @Column
+    private String description;
+    @Column
+    private String fileFormat;
+    @Column
+    private String name;
+    @Column
+    private String provenance;
+    @Column
+    private String scientificType;
+    @Column
+    private String url;
+    @Column
+    private String version;
+    @ManyToOne
+    private StudyEntity study;
+
+    public String getDataFormat() {
+        return dataFormat;
+    }
+
+    public void setDataFormat(String dataFormat) {
+        this.dataFormat = dataFormat;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getFileFormat() {
+        return fileFormat;
+    }
+
+    public void setFileFormat(String fileFormat) {
+        this.fileFormat = fileFormat;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getProvenance() {
+        return provenance;
+    }
+
+    public void setProvenance(String provenance) {
+        this.provenance = provenance;
+    }
+
+    public String getScientificType() {
+        return scientificType;
+    }
+
+    public void setScientificType(String scientificType) {
+        this.scientificType = scientificType;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/DatasetAuthorshipEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/DatasetAuthorshipEntity.java
index 64128668..f3c808cd 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/DatasetAuthorshipEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/DatasetAuthorshipEntity.java
@@ -1,56 +1,64 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
+import java.util.Date;
+
 @Entity
 @Table(name = "trial_dataset_authorship")
 public class DatasetAuthorshipEntity extends BrAPIBaseEntity {
-	@Column
-	private String datasetPUI;
-	@Column 
-	private String license;
-	@Column
-	private Date publicReleaseDate;
-	@Column
-	private Date submissionDate;
-	@ManyToOne
-	private TrialEntity trial;
-	
-	public TrialEntity getTrial() {
-		return trial;
-	}
-	public void setTrial(TrialEntity trial) {
-		this.trial = trial;
-	}
-	public String getDatasetPUI() {
-		return datasetPUI;
-	}
-	public void setDatasetPUI(String datasetPUI) {
-		this.datasetPUI = datasetPUI;
-	}
-	public String getLicense() {
-		return license;
-	}
-	public void setLicense(String license) {
-		this.license = license;
-	}
-	public Date getPublicReleaseDate() {
-		return publicReleaseDate;
-	}
-	public void setPublicReleaseDate(Date publicReleaseDate) {
-		this.publicReleaseDate = publicReleaseDate;
-	}
-	public Date getSubmissionDate() {
-		return submissionDate;
-	}
-	public void setSubmissionDate(Date submissionDate) {
-		this.submissionDate = submissionDate;
-	}
+    @Column
+    private String datasetPUI;
+    @Column
+    private String license;
+    @Column
+    private Date publicReleaseDate;
+    @Column
+    private Date submissionDate;
+    @ManyToOne
+    private TrialEntity trial;
+
+    public TrialEntity getTrial() {
+        return trial;
+    }
+
+    public void setTrial(TrialEntity trial) {
+        this.trial = trial;
+    }
+
+    public String getDatasetPUI() {
+        return datasetPUI;
+    }
+
+    public void setDatasetPUI(String datasetPUI) {
+        this.datasetPUI = datasetPUI;
+    }
+
+    public String getLicense() {
+        return license;
+    }
+
+    public void setLicense(String license) {
+        this.license = license;
+    }
+
+    public Date getPublicReleaseDate() {
+        return publicReleaseDate;
+    }
+
+    public void setPublicReleaseDate(Date publicReleaseDate) {
+        this.publicReleaseDate = publicReleaseDate;
+    }
+
+    public Date getSubmissionDate() {
+        return submissionDate;
+    }
+
+    public void setSubmissionDate(Date submissionDate) {
+        this.submissionDate = submissionDate;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/EnvironmentParametersEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/EnvironmentParametersEntity.java
index 00384393..61428265 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/EnvironmentParametersEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/EnvironmentParametersEntity.java
@@ -1,94 +1,93 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "study_environment_parameter")
 public class EnvironmentParametersEntity extends BrAPIBaseEntity {
-	@Column
-	private String description;
-	@Column
-	private String parameterName;
-	@Column
-	private String parameterPUI;
-	@Column
-	private String unit;
-	@Column
-	private String unitPUI;
-	@Column
-	private String value;
-	@Column
-	private String valuePUI;
-	@ManyToOne
-	private StudyEntity study;
-
-	public StudyEntity getStudy() {
-		return study;
-	}
-
-	public void setStudy(StudyEntity study) {
-		this.study = study;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getParameterName() {
-		return parameterName;
-	}
-
-	public void setParameterName(String parameterName) {
-		this.parameterName = parameterName;
-	}
-
-	public String getParameterPUI() {
-		return parameterPUI;
-	}
-
-	public void setParameterPUI(String parameterPUI) {
-		this.parameterPUI = parameterPUI;
-	}
-
-	public String getUnit() {
-		return unit;
-	}
-
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-
-	public String getUnitPUI() {
-		return unitPUI;
-	}
-
-	public void setUnitPUI(String unitPUI) {
-		this.unitPUI = unitPUI;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public String getValuePUI() {
-		return valuePUI;
-	}
-
-	public void setValuePUI(String valuePUI) {
-		this.valuePUI = valuePUI;
-	}
+    @Column
+    private String description;
+    @Column
+    private String parameterName;
+    @Column
+    private String parameterPUI;
+    @Column
+    private String unit;
+    @Column
+    private String unitPUI;
+    @Column
+    private String value;
+    @Column
+    private String valuePUI;
+    @ManyToOne
+    private StudyEntity study;
+
+    public StudyEntity getStudy() {
+        return study;
+    }
+
+    public void setStudy(StudyEntity study) {
+        this.study = study;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getParameterName() {
+        return parameterName;
+    }
+
+    public void setParameterName(String parameterName) {
+        this.parameterName = parameterName;
+    }
+
+    public String getParameterPUI() {
+        return parameterPUI;
+    }
+
+    public void setParameterPUI(String parameterPUI) {
+        this.parameterPUI = parameterPUI;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getUnitPUI() {
+        return unitPUI;
+    }
+
+    public void setUnitPUI(String unitPUI) {
+        this.unitPUI = unitPUI;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getValuePUI() {
+        return valuePUI;
+    }
+
+    public void setValuePUI(String valuePUI) {
+        this.valuePUI = valuePUI;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ExperimentalDesignEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ExperimentalDesignEntity.java
index c1340f7e..80d7e2a7 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ExperimentalDesignEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ExperimentalDesignEntity.java
@@ -1,43 +1,42 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "study_experimental_design")
 public class ExperimentalDesignEntity extends BrAPIBaseEntity {
-	@Column
-	private String PUI;
-	@Column
-	private String description;
-	@OneToOne
-	private StudyEntity study;
-
-	public StudyEntity getStudy() {
-		return study;
-	}
-
-	public void setStudy(StudyEntity study) {
-		this.study = study;
-	}
-
-	public String getPUI() {
-		return PUI;
-	}
-
-	public void setPUI(String pUI) {
-		PUI = pUI;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
+    @Column
+    private String PUI;
+    @Column
+    private String description;
+    @OneToOne
+    private StudyEntity study;
+
+    public StudyEntity getStudy() {
+        return study;
+    }
+
+    public void setStudy(StudyEntity study) {
+        this.study = study;
+    }
+
+    public String getPUI() {
+        return PUI;
+    }
+
+    public void setPUI(String pUI) {
+        PUI = pUI;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/GrowthFacilityEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/GrowthFacilityEntity.java
index 956b8438..62ed5d60 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/GrowthFacilityEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/GrowthFacilityEntity.java
@@ -1,43 +1,42 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "study_growth_facility")
 public class GrowthFacilityEntity extends BrAPIBaseEntity {
-	@Column
-	private String PUI;
-	@Column
-	private String description;
-	@OneToOne
-	private StudyEntity study;
-
-	public StudyEntity getStudy() {
-		return study;
-	}
-
-	public void setStudy(StudyEntity study) {
-		this.study = study;
-	}
-
-	public String getPUI() {
-		return PUI;
-	}
-
-	public void setPUI(String pUI) {
-		PUI = pUI;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
+    @Column
+    private String PUI;
+    @Column
+    private String description;
+    @OneToOne
+    private StudyEntity study;
+
+    public StudyEntity getStudy() {
+        return study;
+    }
+
+    public void setStudy(StudyEntity study) {
+        this.study = study;
+    }
+
+    public String getPUI() {
+        return PUI;
+    }
+
+    public void setPUI(String pUI) {
+        PUI = pUI;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListEntity.java
index a56d4a1a..7fd3a403 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListEntity.java
@@ -1,113 +1,106 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
+import io.swagger.model.core.ListTypes;
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
-import io.swagger.model.core.ListTypes;
+import java.util.Date;
+import java.util.List;
 
 @Entity
 @Table(name = "list")
 public class ListEntity extends BrAPIPrimaryEntity {
-	@Column
-	private Date dateCreated;
-	@Column
-	private Date dateModified;
-	@Column
-	private String description;
-	@Column
-	private String listName;
-	@Column
-	private String listOwnerName;
-	@Column
-	private String listSource;
-	@Column
-	private ListTypes listType;
-
-	@ManyToOne
-	private PersonEntity listOwnerPerson;
-	@OneToMany(mappedBy="list", cascade = CascadeType.ALL)
-	private List<ListItemEntity> data;
-
-	public PersonEntity getListOwnerPerson() {
-		return listOwnerPerson;
-	}
-
-	public void setListOwnerPerson(PersonEntity listOwnerPerson) {
-		this.listOwnerPerson = listOwnerPerson;
-	}
-
-	public Date getDateCreated() {
-		return dateCreated;
-	}
-
-	public void setDateCreated(Date dateCreated) {
-		this.dateCreated = dateCreated;
-	}
-
-	public Date getDateModified() {
-		return dateModified;
-	}
-
-	public void setDateModified(Date dateModified) {
-		this.dateModified = dateModified;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getListName() {
-		return listName;
-	}
-
-	public void setListName(String listName) {
-		this.listName = listName;
-	}
-
-	public String getListOwnerName() {
-		return listOwnerName;
-	}
-
-	public void setListOwnerName(String listOwnerName) {
-		this.listOwnerName = listOwnerName;
-	}
-
-	public String getListSource() {
-		return listSource;
-	}
-
-	public void setListSource(String listSource) {
-		this.listSource = listSource;
-	}
-
-	public ListTypes getListType() {
-		return listType;
-	}
-
-	public void setListType(ListTypes listType) {
-		this.listType = listType;
-	}
-
-	public List<ListItemEntity> getData() {
-		return data;
-	}
-
-	public void setData(List<ListItemEntity> data) {
-		this.data = data;
-	}
-	
-	
+    @Column
+    private Date dateCreated;
+    @Column
+    private Date dateModified;
+    @Column
+    private String description;
+    @Column
+    private String listName;
+    @Column
+    private String listOwnerName;
+    @Column
+    private String listSource;
+    @Column
+    private ListTypes listType;
+
+    @ManyToOne
+    private PersonEntity listOwnerPerson;
+    @OneToMany(mappedBy = "list", cascade = CascadeType.ALL)
+    private List<ListItemEntity> data;
+
+    public PersonEntity getListOwnerPerson() {
+        return listOwnerPerson;
+    }
+
+    public void setListOwnerPerson(PersonEntity listOwnerPerson) {
+        this.listOwnerPerson = listOwnerPerson;
+    }
+
+    public Date getDateCreated() {
+        return dateCreated;
+    }
+
+    public void setDateCreated(Date dateCreated) {
+        this.dateCreated = dateCreated;
+    }
+
+    public Date getDateModified() {
+        return dateModified;
+    }
+
+    public void setDateModified(Date dateModified) {
+        this.dateModified = dateModified;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getListName() {
+        return listName;
+    }
+
+    public void setListName(String listName) {
+        this.listName = listName;
+    }
+
+    public String getListOwnerName() {
+        return listOwnerName;
+    }
+
+    public void setListOwnerName(String listOwnerName) {
+        this.listOwnerName = listOwnerName;
+    }
+
+    public String getListSource() {
+        return listSource;
+    }
+
+    public void setListSource(String listSource) {
+        this.listSource = listSource;
+    }
+
+    public ListTypes getListType() {
+        return listType;
+    }
+
+    public void setListType(ListTypes listType) {
+        this.listType = listType;
+    }
+
+    public List<ListItemEntity> getData() {
+        return data;
+    }
+
+    public void setData(List<ListItemEntity> data) {
+        this.data = data;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListItemEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListItemEntity.java
index db045d21..477d0076 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListItemEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListItemEntity.java
@@ -1,33 +1,31 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "list_item")
 public class ListItemEntity extends BrAPIBaseEntity {
-	@ManyToOne(cascade = CascadeType.ALL)
-	private ListEntity list;
-	@Column
-	private String item;
-	
-	public ListEntity getList() {
-		return list;
-	}
-	public void setList(ListEntity list) {
-		this.list = list;
-	}
-	public String getItem() {
-		return item;
-	}
-	public void setItem(String item) {
-		this.item = item;
-	}
-	
-	
+    @ManyToOne(cascade = CascadeType.ALL)
+    private ListEntity list;
+    @Column
+    private String item;
+
+    public ListEntity getList() {
+        return list;
+    }
+
+    public void setList(ListEntity list) {
+        this.list = list;
+    }
+
+    public String getItem() {
+        return item;
+    }
+
+    public void setItem(String item) {
+        this.item = item;
+    }
+
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/LocationEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/LocationEntity.java
index bc989f61..94eeb100 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/LocationEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/LocationEntity.java
@@ -1,170 +1,201 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.GeoJSONEntity;
 
 @Entity
-@Table(name="location")
-public class LocationEntity extends BrAPIPrimaryEntity{
-	@Column
-	private String abbreviation;
-	@Column
-	private String coordinateDescription;
-	@Column
-	private String coordinateUncertainty;
-	@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
-	private GeoJSONEntity coordinates;
-	@Column
-	private String countryCode;
-	@Column
-	private String countryName;
-	@Column
-	private String documentationURL;
-	@Column
-	private String environmentType;
-	@Column
-	private String exposure;
-	@Column
-	private String instituteAddress;
-	@Column
-	private String instituteName;
-	@Column
-	private String locationName;
-	@Column
-	private String locationType;
-	@Column
-	private String siteStatus;
-	@Column
-	private String slope;
-	@Column
-	private String topography;
-	@ManyToOne
-	private CropEntity crop;
-	@ManyToOne
-	private ProgramEntity program;
-	@ManyToOne
-	private LocationEntity parentLocation;
-
-	public LocationEntity getParentLocation() {
-		return parentLocation;
-	}
-	public void setParentLocation(LocationEntity parentLocation) {
-		this.parentLocation = parentLocation;
-	}
-	public CropEntity getCrop() {
-		return crop;
-	}
-	public void setCrop(CropEntity crop) {
-		this.crop = crop;
-	}
-	public ProgramEntity getProgram() {
-		return program;
-	}
-	public void setProgram(ProgramEntity program) {
-		this.program = program;
-	}
-	public String getCoordinateDescription() {
-		return coordinateDescription;
-	}
-	public void setCoordinateDescription(String coordinateDescription) {
-		this.coordinateDescription = coordinateDescription;
-	}
-	public String getCoordinateUncertainty() {
-		return coordinateUncertainty;
-	}
-	public void setCoordinateUncertainty(String coordinateUncertainty) {
-		this.coordinateUncertainty = coordinateUncertainty;
-	}
-	public GeoJSONEntity getCoordinates() {
-		return coordinates;
-	}
-	public void setCoordinates(GeoJSONEntity coordinates) {
-		this.coordinates = coordinates;
-	}
-	public String getEnvironmentType() {
-		return environmentType;
-	}
-	public void setEnvironmentType(String environmentType) {
-		this.environmentType = environmentType;
-	}
-	public String getExposure() {
-		return exposure;
-	}
-	public void setExposure(String exposure) {
-		this.exposure = exposure;
-	}
-	public String getLocationName() {
-		return locationName;
-	}
-	public void setLocationName(String locationName) {
-		this.locationName = locationName;
-	}
-	public String getSiteStatus() {
-		return siteStatus;
-	}
-	public void setSiteStatus(String siteStatus) {
-		this.siteStatus = siteStatus;
-	}
-	public String getSlope() {
-		return slope;
-	}
-	public void setSlope(String slope) {
-		this.slope = slope;
-	}
-	public String getTopography() {
-		return topography;
-	}
-	public void setTopography(String topography) {
-		this.topography = topography;
-	}
-	public String getDocumentationURL() {
-		return documentationURL;
-	}
-	public void setDocumentationURL(String documentationURL) {
-		this.documentationURL = documentationURL;
-	}
-	public String getLocationType() {
-		return locationType;
-	}
-	public void setLocationType(String locationType) {
-		this.locationType = locationType;
-	}
-	public String getAbbreviation() {
-		return abbreviation;
-	}
-	public void setAbbreviation(String abbreviation) {
-		this.abbreviation = abbreviation;
-	}
-	public String getCountryCode() {
-		return countryCode;
-	}
-	public void setCountryCode(String countryCode) {
-		this.countryCode = countryCode;
-	}
-	public String getCountryName() {
-		return countryName;
-	}
-	public void setCountryName(String countryName) {
-		this.countryName = countryName;
-	}
-	public String getInstituteName() {
-		return instituteName;
-	}
-	public void setInstituteName(String instituteName) {
-		this.instituteName = instituteName;
-	}
-	public String getInstituteAddress() {
-		return instituteAddress;
-	}
-	public void setInstituteAddress(String instituteAddress) {
-		this.instituteAddress = instituteAddress;
-	}
+@Table(name = "location")
+public class LocationEntity extends BrAPIPrimaryEntity {
+    @Column
+    private String abbreviation;
+    @Column
+    private String coordinateDescription;
+    @Column
+    private String coordinateUncertainty;
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
+    private GeoJSONEntity coordinates;
+    @Column
+    private String countryCode;
+    @Column
+    private String countryName;
+    @Column
+    private String documentationURL;
+    @Column
+    private String environmentType;
+    @Column
+    private String exposure;
+    @Column
+    private String instituteAddress;
+    @Column
+    private String instituteName;
+    @Column
+    private String locationName;
+    @Column
+    private String locationType;
+    @Column
+    private String siteStatus;
+    @Column
+    private String slope;
+    @Column
+    private String topography;
+    @ManyToOne
+    private CropEntity crop;
+    @ManyToOne
+    private ProgramEntity program;
+    @ManyToOne
+    private LocationEntity parentLocation;
+
+    public LocationEntity getParentLocation() {
+        return parentLocation;
+    }
+
+    public void setParentLocation(LocationEntity parentLocation) {
+        this.parentLocation = parentLocation;
+    }
+
+    public CropEntity getCrop() {
+        return crop;
+    }
+
+    public void setCrop(CropEntity crop) {
+        this.crop = crop;
+    }
+
+    public ProgramEntity getProgram() {
+        return program;
+    }
+
+    public void setProgram(ProgramEntity program) {
+        this.program = program;
+    }
+
+    public String getCoordinateDescription() {
+        return coordinateDescription;
+    }
+
+    public void setCoordinateDescription(String coordinateDescription) {
+        this.coordinateDescription = coordinateDescription;
+    }
+
+    public String getCoordinateUncertainty() {
+        return coordinateUncertainty;
+    }
+
+    public void setCoordinateUncertainty(String coordinateUncertainty) {
+        this.coordinateUncertainty = coordinateUncertainty;
+    }
+
+    public GeoJSONEntity getCoordinates() {
+        return coordinates;
+    }
+
+    public void setCoordinates(GeoJSONEntity coordinates) {
+        this.coordinates = coordinates;
+    }
+
+    public String getEnvironmentType() {
+        return environmentType;
+    }
+
+    public void setEnvironmentType(String environmentType) {
+        this.environmentType = environmentType;
+    }
+
+    public String getExposure() {
+        return exposure;
+    }
+
+    public void setExposure(String exposure) {
+        this.exposure = exposure;
+    }
+
+    public String getLocationName() {
+        return locationName;
+    }
+
+    public void setLocationName(String locationName) {
+        this.locationName = locationName;
+    }
+
+    public String getSiteStatus() {
+        return siteStatus;
+    }
+
+    public void setSiteStatus(String siteStatus) {
+        this.siteStatus = siteStatus;
+    }
+
+    public String getSlope() {
+        return slope;
+    }
+
+    public void setSlope(String slope) {
+        this.slope = slope;
+    }
+
+    public String getTopography() {
+        return topography;
+    }
+
+    public void setTopography(String topography) {
+        this.topography = topography;
+    }
+
+    public String getDocumentationURL() {
+        return documentationURL;
+    }
+
+    public void setDocumentationURL(String documentationURL) {
+        this.documentationURL = documentationURL;
+    }
+
+    public String getLocationType() {
+        return locationType;
+    }
+
+    public void setLocationType(String locationType) {
+        this.locationType = locationType;
+    }
+
+    public String getAbbreviation() {
+        return abbreviation;
+    }
+
+    public void setAbbreviation(String abbreviation) {
+        this.abbreviation = abbreviation;
+    }
+
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    public void setCountryCode(String countryCode) {
+        this.countryCode = countryCode;
+    }
+
+    public String getCountryName() {
+        return countryName;
+    }
+
+    public void setCountryName(String countryName) {
+        this.countryName = countryName;
+    }
+
+    public String getInstituteName() {
+        return instituteName;
+    }
+
+    public void setInstituteName(String instituteName) {
+        this.instituteName = instituteName;
+    }
+
+    public String getInstituteAddress() {
+        return instituteAddress;
+    }
+
+    public void setInstituteAddress(String instituteAddress) {
+        this.instituteAddress = instituteAddress;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ObservationLevelEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ObservationLevelEntity.java
index a51c5b1b..edbb342e 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ObservationLevelEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ObservationLevelEntity.java
@@ -1,32 +1,34 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "study_observation_level")
 public class ObservationLevelEntity extends BrAPIBaseEntity {
-	@Column
-	private String levelName;
-	@Column
-	private Integer levelOrder;
-	@ManyToOne
-	private StudyEntity study;
-	
-	public String getLevelName() {
-		return levelName;
-	}
-	public void setLevelName(String levelName) {
-		this.levelName = levelName;
-	}
-	public Integer getLevelOrder() {
-		return levelOrder;
-	}
-	public void setLevelOrder(Integer levelOrder) {
-		this.levelOrder = levelOrder;
-	}
+    @Column
+    private String levelName;
+    @Column
+    private Integer levelOrder;
+    @ManyToOne
+    private StudyEntity study;
+
+    public String getLevelName() {
+        return levelName;
+    }
+
+    public void setLevelName(String levelName) {
+        this.levelName = levelName;
+    }
+
+    public Integer getLevelOrder() {
+        return levelOrder;
+    }
+
+    public void setLevelOrder(Integer levelOrder) {
+        this.levelOrder = levelOrder;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/PersonEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/PersonEntity.java
index ca585e7e..878f204a 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/PersonEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/PersonEntity.java
@@ -1,117 +1,120 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
 @Entity
 @Table(name = "person")
 public class PersonEntity extends BrAPIPrimaryEntity {
-	@Column
-	private String description;
-	@Column
-	private String emailAddress;
-	@Column
-	private String firstName;
-	@Column
-	private String lastName;
-	@Column
-	private String mailingAddress;
-	@Column
-	private String middleName;
-	@Column
-	private String phoneNumber;
-	@Column
-	private String userID;
-	@Column
-	private String instituteName;
-
-	public String getName() {
-		String name = getFirstName();
-		if(!getLastName().isEmpty()) 
-			name = (name + " " + getLastName()).trim();
-		
-		return name;
-	}
-	public String getFullName() {
-		String name = getFirstName();
-		if(!getMiddleName().isEmpty()) 
-			name = (name + " " + getMiddleName()).trim();
-		if(!getLastName().isEmpty()) 
-			name = (name + " " + getLastName()).trim();
-		
-		return name;
-	}
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getEmailAddress() {
-		return emailAddress;
-	}
-
-	public void setEmailAddress(String emailAddress) {
-		this.emailAddress = emailAddress;
-	}
-
-	public String getFirstName() {
-		return firstName;
-	}
-
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-
-	public String getLastName() {
-		return lastName;
-	}
-
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-
-	public String getMailingAddress() {
-		return mailingAddress;
-	}
-
-	public void setMailingAddress(String mailingAddress) {
-		this.mailingAddress = mailingAddress;
-	}
-
-	public String getMiddleName() {
-		return middleName;
-	}
-
-	public void setMiddleName(String middleName) {
-		this.middleName = middleName;
-	}
-
-	public String getPhoneNumber() {
-		return phoneNumber;
-	}
-
-	public void setPhoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
-	}
-
-	public String getUserID() {
-		return userID;
-	}
-
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-	public String getInstituteName() {
-		return instituteName;
-	}
-	public void setInstituteName(String instituteName) {
-		this.instituteName = instituteName;
-	}
+    @Column
+    private String description;
+    @Column
+    private String emailAddress;
+    @Column
+    private String firstName;
+    @Column
+    private String lastName;
+    @Column
+    private String mailingAddress;
+    @Column
+    private String middleName;
+    @Column
+    private String phoneNumber;
+    @Column
+    private String userID;
+    @Column
+    private String instituteName;
+
+    public String getName() {
+        String name = getFirstName();
+        if (!getLastName().isEmpty())
+            name = (name + " " + getLastName()).trim();
+
+        return name;
+    }
+
+    public String getFullName() {
+        String name = getFirstName();
+        if (!getMiddleName().isEmpty())
+            name = (name + " " + getMiddleName()).trim();
+        if (!getLastName().isEmpty())
+            name = (name + " " + getLastName()).trim();
+
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getEmailAddress() {
+        return emailAddress;
+    }
+
+    public void setEmailAddress(String emailAddress) {
+        this.emailAddress = emailAddress;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getMailingAddress() {
+        return mailingAddress;
+    }
+
+    public void setMailingAddress(String mailingAddress) {
+        this.mailingAddress = mailingAddress;
+    }
+
+    public String getMiddleName() {
+        return middleName;
+    }
+
+    public void setMiddleName(String middleName) {
+        this.middleName = middleName;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public String getUserID() {
+        return userID;
+    }
+
+    public void setUserID(String userID) {
+        this.userID = userID;
+    }
+
+    public String getInstituteName() {
+        return instituteName;
+    }
+
+    public void setInstituteName(String instituteName) {
+        this.instituteName = instituteName;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ProgramEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ProgramEntity.java
index 38dafbab..91deafbc 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ProgramEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ProgramEntity.java
@@ -1,123 +1,137 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import io.swagger.model.core.ProgramSearchRequest.ProgramTypesEnum;
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
 
-import io.swagger.model.core.ProgramSearchRequest.ProgramTypesEnum;
+import java.util.List;
 
 @Entity
-@Table(name="program")
-public class ProgramEntity extends BrAPIPrimaryEntity{
-	@Column
-	private String name;
-	@Column
-	private String abbreviation;
-	@Column
-	private String objective;
-	@Column
-	private String fundingInformation;
-	@Column
-	private ProgramTypesEnum programType;
-	@Column
-	private String documentationURL;
-	@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
-	private PersonEntity leadPerson;
-	
-	@ManyToOne
-	private CropEntity crop;
-	
-	@OneToMany(mappedBy="program")
-	private List<TrialEntity> trials;
-	@OneToMany(mappedBy="program")
-	private List<StudyEntity> studies;
-	@OneToMany(mappedBy="program")
-	private List<ObservationUnitEntity> observationUnits;
-	@OneToMany(mappedBy="program")
-	private List<ObservationEntity> observations;
-
-	
-	
-	public String getFundingInformation() {
-		return fundingInformation;
-	}
-	public void setFundingInformation(String fundingInformation) {
-		this.fundingInformation = fundingInformation;
-	}
-	public ProgramTypesEnum getProgramType() {
-		return programType;
-	}
-	public void setProgramType(ProgramTypesEnum programType) {
-		this.programType = programType;
-	}
-	public List<StudyEntity> getStudies() {
-		return studies;
-	}
-	public void setStudies(List<StudyEntity> studies) {
-		this.studies = studies;
-	}
-	public List<ObservationUnitEntity> getObservationUnits() {
-		return observationUnits;
-	}
-	public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
-		this.observationUnits = observationUnits;
-	}
-	public List<ObservationEntity> getObservations() {
-		return observations;
-	}
-	public void setObservations(List<ObservationEntity> observations) {
-		this.observations = observations;
-	}
-	public String getDocumentationURL() {
-		return documentationURL;
-	}
-	public void setDocumentationURL(String documentationURL) {
-		this.documentationURL = documentationURL;
-	}
-	public PersonEntity getLeadPerson() {
-		return leadPerson;
-	}
-	public void setLeadPerson(PersonEntity leadPerson) {
-		this.leadPerson = leadPerson;
-	}
-	public CropEntity getCrop() {
-		return crop;
-	}
-	public void setCrop(CropEntity crop) {
-		this.crop = crop;
-	}
-	public List<TrialEntity> getTrials() {
-		return trials;
-	}
-	public void setTrials(List<TrialEntity> trials) {
-		this.trials = trials;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getAbbreviation() {
-		return abbreviation;
-	}
-	public void setAbbreviation(String abbreviation) {
-		this.abbreviation = abbreviation;
-	}
-	public String getObjective() {
-		return objective;
-	}
-	public void setObjective(String objective) {
-		this.objective = objective;
-	}
+@Table(name = "program")
+public class ProgramEntity extends BrAPIPrimaryEntity {
+    @Column
+    private String name;
+    @Column
+    private String abbreviation;
+    @Column
+    private String objective;
+    @Column
+    private String fundingInformation;
+    @Column
+    private ProgramTypesEnum programType;
+    @Column
+    private String documentationURL;
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
+    private PersonEntity leadPerson;
+
+    @ManyToOne
+    private CropEntity crop;
+
+    @OneToMany(mappedBy = "program")
+    private List<TrialEntity> trials;
+    @OneToMany(mappedBy = "program")
+    private List<StudyEntity> studies;
+    @OneToMany(mappedBy = "program")
+    private List<ObservationUnitEntity> observationUnits;
+    @OneToMany(mappedBy = "program")
+    private List<ObservationEntity> observations;
+
+
+    public String getFundingInformation() {
+        return fundingInformation;
+    }
+
+    public void setFundingInformation(String fundingInformation) {
+        this.fundingInformation = fundingInformation;
+    }
+
+    public ProgramTypesEnum getProgramType() {
+        return programType;
+    }
+
+    public void setProgramType(ProgramTypesEnum programType) {
+        this.programType = programType;
+    }
+
+    public List<StudyEntity> getStudies() {
+        return studies;
+    }
+
+    public void setStudies(List<StudyEntity> studies) {
+        this.studies = studies;
+    }
+
+    public List<ObservationUnitEntity> getObservationUnits() {
+        return observationUnits;
+    }
+
+    public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
+        this.observationUnits = observationUnits;
+    }
+
+    public List<ObservationEntity> getObservations() {
+        return observations;
+    }
+
+    public void setObservations(List<ObservationEntity> observations) {
+        this.observations = observations;
+    }
+
+    public String getDocumentationURL() {
+        return documentationURL;
+    }
+
+    public void setDocumentationURL(String documentationURL) {
+        this.documentationURL = documentationURL;
+    }
+
+    public PersonEntity getLeadPerson() {
+        return leadPerson;
+    }
+
+    public void setLeadPerson(PersonEntity leadPerson) {
+        this.leadPerson = leadPerson;
+    }
+
+    public CropEntity getCrop() {
+        return crop;
+    }
+
+    public void setCrop(CropEntity crop) {
+        this.crop = crop;
+    }
+
+    public List<TrialEntity> getTrials() {
+        return trials;
+    }
+
+    public void setTrials(List<TrialEntity> trials) {
+        this.trials = trials;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAbbreviation() {
+        return abbreviation;
+    }
+
+    public void setAbbreviation(String abbreviation) {
+        this.abbreviation = abbreviation;
+    }
+
+    public String getObjective() {
+        return objective;
+    }
+
+    public void setObjective(String objective) {
+        this.objective = objective;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/PublicationEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/PublicationEntity.java
index 209126ce..85999720 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/PublicationEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/PublicationEntity.java
@@ -1,39 +1,43 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "trial_publication")
 public class PublicationEntity extends BrAPIBaseEntity {
-	@Column
-	private String publicationPUI;
-	@Column 
-	private String publicationReference;
-	@ManyToOne
-	private TrialEntity trial;
-	
-	public String getPublicationPUI() {
-		return publicationPUI;
-	}
-	public void setPublicationPUI(String publicationPUI) {
-		this.publicationPUI = publicationPUI;
-	}
-	public String getPublicationReference() {
-		return publicationReference;
-	}
-	public void setPublicationReference(String publicationReference) {
-		this.publicationReference = publicationReference;
-	}
-	public TrialEntity getTrial() {
-		return trial;
-	}
-	public void setTrial(TrialEntity trial) {
-		this.trial = trial;
-	}
-	
+    @Column
+    private String publicationPUI;
+    @Column
+    private String publicationReference;
+    @ManyToOne
+    private TrialEntity trial;
+
+    public String getPublicationPUI() {
+        return publicationPUI;
+    }
+
+    public void setPublicationPUI(String publicationPUI) {
+        this.publicationPUI = publicationPUI;
+    }
+
+    public String getPublicationReference() {
+        return publicationReference;
+    }
+
+    public void setPublicationReference(String publicationReference) {
+        this.publicationReference = publicationReference;
+    }
+
+    public TrialEntity getTrial() {
+        return trial;
+    }
+
+    public void setTrial(TrialEntity trial) {
+        this.trial = trial;
+    }
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/SeasonEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/SeasonEntity.java
index c881d93e..37ede546 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/SeasonEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/SeasonEntity.java
@@ -1,30 +1,31 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
 @Entity
-@Table(name="season")
-public class SeasonEntity extends BrAPIPrimaryEntity{
-	@Column
-	private String season;
-	@Column
-	private Integer year;
-	
-	public String getSeason() {
-		return season;
-	}
-	public void setSeason(String season) {
-		this.season = season;
-	}
-	public Integer getYear() {
-		return year;
-	}
-	public void setYear(Integer year) {
-		this.year = year;
-	}
+@Table(name = "season")
+public class SeasonEntity extends BrAPIPrimaryEntity {
+    @Column
+    private String season;
+    @Column
+    private Integer year;
+
+    public String getSeason() {
+        return season;
+    }
+
+    public void setSeason(String season) {
+        this.season = season;
+    }
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/StudyEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/StudyEntity.java
index 01c9b0c6..39209106 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/StudyEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/StudyEntity.java
@@ -1,314 +1,304 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationVariableEntity;
 
+import java.util.Date;
+import java.util.List;
+
 @Entity
 @Table(name = "study")
 public class StudyEntity extends BrAPIPrimaryEntity {
 
-	@Column
-	private boolean active;
-	@ManyToMany(cascade = CascadeType.ALL)
-	@JoinTable(name = "study_contact", joinColumns = {
-			@JoinColumn(name = "study_db_id", referencedColumnName = "id") }, inverseJoinColumns = {
-					@JoinColumn(name = "person_db_id", referencedColumnName = "id") })
-	private List<PersonEntity> contacts;
-	@Column
-	private String culturalPractices;
-	@OneToMany(mappedBy = "study")
-	private List<DataLinkEntity> dataLinks;
-	@Column
-	private String documentationURL;
-	@Column
-	private Date endDate;
-	@OneToMany(mappedBy = "study")
-	private List<EnvironmentParametersEntity> environmentParameters;
-	@OneToOne(mappedBy = "study", cascade = CascadeType.ALL, orphanRemoval = true)
-	private ExperimentalDesignEntity experimentalDesign;
-	@OneToOne(mappedBy = "study", cascade = CascadeType.ALL, orphanRemoval = true)
-	private GrowthFacilityEntity growthFacility;
-	@OneToOne(mappedBy = "study", cascade = CascadeType.ALL, orphanRemoval = true)
-	private StudyLastUpdateEntity lastUpdate;
-	@Column
-	private String license;
-	@OneToOne
-	private LocationEntity location;
-	@OneToMany(mappedBy = "study")
-	private List<ObservationLevelEntity> observationLevels;
-	@Column
-	private String observationUnitsDescription;
-	@ManyToMany
-	@JoinTable(name = "study_season", joinColumns = {
-			@JoinColumn(name = "study_db_id", referencedColumnName = "id") }, inverseJoinColumns = {
-					@JoinColumn(name = "season_db_id", referencedColumnName = "id") })
-	private List<SeasonEntity> seasons;
-	@ManyToMany
-	@JoinTable(name = "study_variable", joinColumns = {
-			@JoinColumn(name = "study_db_id", referencedColumnName = "id") }, inverseJoinColumns = {
-					@JoinColumn(name = "variable_db_id", referencedColumnName = "id") })
-	private List<ObservationVariableEntity> observationVariables;
-	@Column
-	private Date startDate;
-	@Column
-	private String studyCode;
-	@Column
-	private String studyDescription;
-	@Column
-	private String studyName;
-	@Column
-	private String studyPUI;
-	@Column
-	private String studyType;
-	
-	@ManyToOne
-	private CropEntity crop;
-	@ManyToOne
-	private ProgramEntity program;
-	@ManyToOne
-	private TrialEntity trial;
-
-	@OneToMany(mappedBy="study")
-	private List<ObservationUnitEntity> observationUnits;
-	@OneToMany(mappedBy="study")
-	private List<ObservationEntity> observations;
-
-	
-	public List<ObservationVariableEntity> getObservationVariables() {
-		return observationVariables;
-	}
-
-	public void setObservationVariables(List<ObservationVariableEntity> observationVariables) {
-		this.observationVariables = observationVariables;
-	}
-
-	public CropEntity getCrop() {
-		return crop;
-	}
-
-	public void setCrop(CropEntity crop) {
-		this.crop = crop;
-	}
-
-	public ProgramEntity getProgram() {
-		return program;
-	}
-
-	public void setProgram(ProgramEntity program) {
-		this.program = program;
-		if (program.getCrop() != null)
-			setCrop(program.getCrop());
-	}
-
-	public List<ObservationUnitEntity> getObservationUnits() {
-		return observationUnits;
-	}
-
-	public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
-		this.observationUnits = observationUnits;
-	}
-
-	public List<ObservationEntity> getObservations() {
-		return observations;
-	}
-
-	public void setObservations(List<ObservationEntity> observations) {
-		this.observations = observations;
-	}
-
-	public boolean isActive() {
-		return active;
-	}
-
-	public void setActive(boolean active) {
-		this.active = active;
-	}
-
-	public List<PersonEntity> getContacts() {
-		return contacts;
-	}
-
-	public void setContacts(List<PersonEntity> contacts) {
-		this.contacts = contacts;
-	}
-
-	public String getCulturalPractices() {
-		return culturalPractices;
-	}
-
-	public void setCulturalPractices(String culturalPractices) {
-		this.culturalPractices = culturalPractices;
-	}
-
-	public List<DataLinkEntity> getDataLinks() {
-		return dataLinks;
-	}
-
-	public void setDataLinks(List<DataLinkEntity> dataLinks) {
-		this.dataLinks = dataLinks;
-	}
-
-	public String getDocumentationURL() {
-		return documentationURL;
-	}
-
-	public void setDocumentationURL(String documentationURL) {
-		this.documentationURL = documentationURL;
-	}
-
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-
-	public List<EnvironmentParametersEntity> getEnvironmentParameters() {
-		return environmentParameters;
-	}
+    @Column
+    private boolean active;
+    @ManyToMany(cascade = CascadeType.ALL)
+    @JoinTable(name = "study_contact", joinColumns = {
+            @JoinColumn(name = "study_db_id", referencedColumnName = "id")}, inverseJoinColumns = {
+            @JoinColumn(name = "person_db_id", referencedColumnName = "id")})
+    private List<PersonEntity> contacts;
+    @Column
+    private String culturalPractices;
+    @OneToMany(mappedBy = "study")
+    private List<DataLinkEntity> dataLinks;
+    @Column
+    private String documentationURL;
+    @Column
+    private Date endDate;
+    @OneToMany(mappedBy = "study")
+    private List<EnvironmentParametersEntity> environmentParameters;
+    @OneToOne(mappedBy = "study", cascade = CascadeType.ALL, orphanRemoval = true)
+    private ExperimentalDesignEntity experimentalDesign;
+    @OneToOne(mappedBy = "study", cascade = CascadeType.ALL, orphanRemoval = true)
+    private GrowthFacilityEntity growthFacility;
+    @OneToOne(mappedBy = "study", cascade = CascadeType.ALL, orphanRemoval = true)
+    private StudyLastUpdateEntity lastUpdate;
+    @Column
+    private String license;
+    @OneToOne
+    private LocationEntity location;
+    @OneToMany(mappedBy = "study")
+    private List<ObservationLevelEntity> observationLevels;
+    @Column
+    private String observationUnitsDescription;
+    @ManyToMany
+    @JoinTable(name = "study_season", joinColumns = {
+            @JoinColumn(name = "study_db_id", referencedColumnName = "id")}, inverseJoinColumns = {
+            @JoinColumn(name = "season_db_id", referencedColumnName = "id")})
+    private List<SeasonEntity> seasons;
+    @ManyToMany
+    @JoinTable(name = "study_variable", joinColumns = {
+            @JoinColumn(name = "study_db_id", referencedColumnName = "id")}, inverseJoinColumns = {
+            @JoinColumn(name = "variable_db_id", referencedColumnName = "id")})
+    private List<ObservationVariableEntity> observationVariables;
+    @Column
+    private Date startDate;
+    @Column
+    private String studyCode;
+    @Column
+    private String studyDescription;
+    @Column
+    private String studyName;
+    @Column
+    private String studyPUI;
+    @Column
+    private String studyType;
+
+    @ManyToOne
+    private CropEntity crop;
+    @ManyToOne
+    private ProgramEntity program;
+    @ManyToOne
+    private TrialEntity trial;
+
+    @OneToMany(mappedBy = "study")
+    private List<ObservationUnitEntity> observationUnits;
+    @OneToMany(mappedBy = "study")
+    private List<ObservationEntity> observations;
+
+
+    public List<ObservationVariableEntity> getObservationVariables() {
+        return observationVariables;
+    }
+
+    public void setObservationVariables(List<ObservationVariableEntity> observationVariables) {
+        this.observationVariables = observationVariables;
+    }
+
+    public CropEntity getCrop() {
+        return crop;
+    }
+
+    public void setCrop(CropEntity crop) {
+        this.crop = crop;
+    }
+
+    public ProgramEntity getProgram() {
+        return program;
+    }
+
+    public void setProgram(ProgramEntity program) {
+        this.program = program;
+        if (program.getCrop() != null)
+            setCrop(program.getCrop());
+    }
+
+    public List<ObservationUnitEntity> getObservationUnits() {
+        return observationUnits;
+    }
+
+    public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
+        this.observationUnits = observationUnits;
+    }
+
+    public List<ObservationEntity> getObservations() {
+        return observations;
+    }
+
+    public void setObservations(List<ObservationEntity> observations) {
+        this.observations = observations;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public List<PersonEntity> getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(List<PersonEntity> contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getCulturalPractices() {
+        return culturalPractices;
+    }
+
+    public void setCulturalPractices(String culturalPractices) {
+        this.culturalPractices = culturalPractices;
+    }
+
+    public List<DataLinkEntity> getDataLinks() {
+        return dataLinks;
+    }
+
+    public void setDataLinks(List<DataLinkEntity> dataLinks) {
+        this.dataLinks = dataLinks;
+    }
+
+    public String getDocumentationURL() {
+        return documentationURL;
+    }
+
+    public void setDocumentationURL(String documentationURL) {
+        this.documentationURL = documentationURL;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public List<EnvironmentParametersEntity> getEnvironmentParameters() {
+        return environmentParameters;
+    }
 
-	public void setEnvironmentParameters(List<EnvironmentParametersEntity> environmentParameters) {
-		this.environmentParameters = environmentParameters;
-	}
+    public void setEnvironmentParameters(List<EnvironmentParametersEntity> environmentParameters) {
+        this.environmentParameters = environmentParameters;
+    }
 
-	public ExperimentalDesignEntity getExperimentalDesign() {
-		return experimentalDesign;
-	}
+    public ExperimentalDesignEntity getExperimentalDesign() {
+        return experimentalDesign;
+    }
 
-	public void setExperimentalDesign(ExperimentalDesignEntity experimentalDesign) {
-		this.experimentalDesign = experimentalDesign;
-	}
+    public void setExperimentalDesign(ExperimentalDesignEntity experimentalDesign) {
+        this.experimentalDesign = experimentalDesign;
+    }
 
-	public GrowthFacilityEntity getGrowthFacility() {
-		return growthFacility;
-	}
+    public GrowthFacilityEntity getGrowthFacility() {
+        return growthFacility;
+    }
 
-	public void setGrowthFacility(GrowthFacilityEntity growthFacility) {
-		this.growthFacility = growthFacility;
-	}
+    public void setGrowthFacility(GrowthFacilityEntity growthFacility) {
+        this.growthFacility = growthFacility;
+    }
 
-	public StudyLastUpdateEntity getLastUpdate() {
-		return lastUpdate;
-	}
-
-	public void setLastUpdate(StudyLastUpdateEntity lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
-
-	public String getLicense() {
-		return license;
-	}
-
-	public void setLicense(String license) {
-		this.license = license;
-	}
-
-	public LocationEntity getLocation() {
-		return location;
-	}
-
-	public void setLocation(LocationEntity location) {
-		this.location = location;
-	}
-
-	public List<ObservationLevelEntity> getObservationLevels() {
-		return observationLevels;
-	}
-
-	public void setObservationLevels(List<ObservationLevelEntity> observationLevels) {
-		this.observationLevels = observationLevels;
-	}
-
-	public String getObservationUnitsDescription() {
-		return observationUnitsDescription;
-	}
-
-	public void setObservationUnitsDescription(String observationUnitsDescription) {
-		this.observationUnitsDescription = observationUnitsDescription;
-	}
-
-	public List<SeasonEntity> getSeasons() {
-		return seasons;
-	}
-
-	public void setSeasons(List<SeasonEntity> seasons) {
-		this.seasons = seasons;
-	}
-
-	public Date getStartDate() {
-		return startDate;
-	}
-
-	public void setStartDate(Date startDate) {
-		this.startDate = startDate;
-	}
-
-	public String getStudyCode() {
-		return studyCode;
-	}
-
-	public void setStudyCode(String studyCode) {
-		this.studyCode = studyCode;
-	}
-
-	public String getStudyDescription() {
-		return studyDescription;
-	}
-
-	public void setStudyDescription(String studyDescription) {
-		this.studyDescription = studyDescription;
-	}
-
-	public String getStudyName() {
-		return studyName;
-	}
-
-	public void setStudyName(String studyName) {
-		this.studyName = studyName;
-	}
-
-	public String getStudyPUI() {
-		return studyPUI;
-	}
-
-	public void setStudyPUI(String studyPUI) {
-		this.studyPUI = studyPUI;
-	}
-
-	public String getStudyType() {
-		return studyType;
-	}
-
-	public void setStudyType(String studyType) {
-		this.studyType = studyType;
-	}
-
-	public TrialEntity getTrial() {
-		return trial;
-	}
-
-	public void setTrial(TrialEntity trial) {
-		this.trial = trial;
-		if (trial.getProgram() != null)
-			setProgram(trial.getProgram());
-		if (trial.getCrop() != null)
-			setCrop(trial.getCrop());
-	}
+    public StudyLastUpdateEntity getLastUpdate() {
+        return lastUpdate;
+    }
+
+    public void setLastUpdate(StudyLastUpdateEntity lastUpdate) {
+        this.lastUpdate = lastUpdate;
+    }
+
+    public String getLicense() {
+        return license;
+    }
+
+    public void setLicense(String license) {
+        this.license = license;
+    }
+
+    public LocationEntity getLocation() {
+        return location;
+    }
+
+    public void setLocation(LocationEntity location) {
+        this.location = location;
+    }
+
+    public List<ObservationLevelEntity> getObservationLevels() {
+        return observationLevels;
+    }
+
+    public void setObservationLevels(List<ObservationLevelEntity> observationLevels) {
+        this.observationLevels = observationLevels;
+    }
+
+    public String getObservationUnitsDescription() {
+        return observationUnitsDescription;
+    }
+
+    public void setObservationUnitsDescription(String observationUnitsDescription) {
+        this.observationUnitsDescription = observationUnitsDescription;
+    }
+
+    public List<SeasonEntity> getSeasons() {
+        return seasons;
+    }
+
+    public void setSeasons(List<SeasonEntity> seasons) {
+        this.seasons = seasons;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getStudyCode() {
+        return studyCode;
+    }
+
+    public void setStudyCode(String studyCode) {
+        this.studyCode = studyCode;
+    }
+
+    public String getStudyDescription() {
+        return studyDescription;
+    }
+
+    public void setStudyDescription(String studyDescription) {
+        this.studyDescription = studyDescription;
+    }
+
+    public String getStudyName() {
+        return studyName;
+    }
+
+    public void setStudyName(String studyName) {
+        this.studyName = studyName;
+    }
+
+    public String getStudyPUI() {
+        return studyPUI;
+    }
+
+    public void setStudyPUI(String studyPUI) {
+        this.studyPUI = studyPUI;
+    }
+
+    public String getStudyType() {
+        return studyType;
+    }
+
+    public void setStudyType(String studyType) {
+        this.studyType = studyType;
+    }
+
+    public TrialEntity getTrial() {
+        return trial;
+    }
+
+    public void setTrial(TrialEntity trial) {
+        this.trial = trial;
+        if (trial.getProgram() != null)
+            setProgram(trial.getProgram());
+        if (trial.getCrop() != null)
+            setCrop(trial.getCrop());
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/StudyLastUpdateEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/StudyLastUpdateEntity.java
index 3d260d25..34bef14f 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/StudyLastUpdateEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/StudyLastUpdateEntity.java
@@ -1,46 +1,45 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
+import java.util.Date;
+
 @Entity
 @Table(name = "study_last_update")
 public class StudyLastUpdateEntity extends BrAPIBaseEntity {
-	@Column
-	private Date timestamp;
-	@Column
-	private String version;
-	@OneToOne
-	private StudyEntity study;
-
-	public StudyEntity getStudy() {
-		return study;
-	}
-
-	public void setStudy(StudyEntity study) {
-		this.study = study;
-	}
-
-	public Date getTimestamp() {
-		return timestamp;
-	}
-
-	public void setTimestamp(Date timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
+    @Column
+    private Date timestamp;
+    @Column
+    private String version;
+    @OneToOne
+    private StudyEntity study;
+
+    public StudyEntity getStudy() {
+        return study;
+    }
+
+    public void setStudy(StudyEntity study) {
+        this.study = study;
+    }
+
+    public Date getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Date timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/TrialEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/TrialEntity.java
index 6032ad40..9cf5f656 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/TrialEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/TrialEntity.java
@@ -1,152 +1,172 @@
 package org.brapi.test.BrAPITestServer.model.entity.core;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
 
+import java.util.Date;
+import java.util.List;
+
 @Entity
 @Table(name = "trial")
 public class TrialEntity extends BrAPIPrimaryEntity {
-	@Column
-	private Boolean active;
-	@ManyToMany(cascade = CascadeType.ALL)
-	@JoinTable(name = "trial_contact", joinColumns = {
-			@JoinColumn(name = "trial_db_id", referencedColumnName = "id") }, inverseJoinColumns = {
-					@JoinColumn(name = "person_db_id", referencedColumnName = "id") })
-	private List<PersonEntity> contacts;
-	@OneToMany(mappedBy = "trial")
-	private List<DatasetAuthorshipEntity> datasetAuthorships;
-	@Column
-	private String documentationURL;
-	@Column
-	private Date endDate;
-	@OneToMany(mappedBy = "trial")
-	private List<PublicationEntity> publications;
-	@Column
-	private Date startDate;
-	@Column
-	private String trialDescription;
-	@Column
-	private String trialName;
-	@Column
-	private String trialPUI;
-
-	@ManyToOne
-	private CropEntity crop;
-	@ManyToOne
-	private ProgramEntity program;
-	
-	@OneToMany(mappedBy = "trial")
-	private List<StudyEntity> studies;
-	@OneToMany(mappedBy="trial")
-	private List<ObservationUnitEntity> observationUnits;
-	@OneToMany(mappedBy="trial")
-	private List<ObservationEntity> observations;
-	
-	public CropEntity getCrop() {
-		return crop;
-	}
-	public void setCrop(CropEntity crop) {
-		this.crop = crop;
-	}
-	public List<ObservationUnitEntity> getObservationUnits() {
-		return observationUnits;
-	}
-	public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
-		this.observationUnits = observationUnits;
-	}
-	public List<ObservationEntity> getObservations() {
-		return observations;
-	}
-	public void setObservations(List<ObservationEntity> observations) {
-		this.observations = observations;
-	}
-	public Boolean isActive() {
-		return active;
-	}
-	public void setActive(Boolean active) {
-		this.active = active;
-	}
-	public List<PersonEntity> getContacts() {
-		return contacts;
-	}
-	public void setContacts(List<PersonEntity> contacts) {
-		this.contacts = contacts;
-	}
-	public List<DatasetAuthorshipEntity> getDatasetAuthorships() {
-		return datasetAuthorships;
-	}
-	public void setDatasetAuthorships(List<DatasetAuthorshipEntity> datasetAuthorships) {
-		this.datasetAuthorships = datasetAuthorships;
-	}
-	public String getDocumentationURL() {
-		return documentationURL;
-	}
-	public void setDocumentationURL(String documentationURL) {
-		this.documentationURL = documentationURL;
-	}
-	public Date getEndDate() {
-		return endDate;
-	}
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-	public ProgramEntity getProgram() {
-		return program;
-	}
-	public void setProgram(ProgramEntity program) {
-		this.program = program;
-		if (program.getCrop() != null)
-			setCrop(program.getCrop());
-	}
-	public List<PublicationEntity> getPublications() {
-		return publications;
-	}
-	public void setPublications(List<PublicationEntity> publications) {
-		this.publications = publications;
-	}
-	public Date getStartDate() {
-		return startDate;
-	}
-	public void setStartDate(Date startDate) {
-		this.startDate = startDate;
-	}
-	public String getTrialDescription() {
-		return trialDescription;
-	}
-	public void setTrialDescription(String trialDescription) {
-		this.trialDescription = trialDescription;
-	}
-	public String getTrialName() {
-		return trialName;
-	}
-	public void setTrialName(String trialName) {
-		this.trialName = trialName;
-	}
-	public String getTrialPUI() {
-		return trialPUI;
-	}
-	public void setTrialPUI(String trialPUI) {
-		this.trialPUI = trialPUI;
-	}
-	public List<StudyEntity> getStudies() {
-		return studies;
-	}
-	public void setStudies(List<StudyEntity> studies) {
-		this.studies = studies;
-	}
+    @Column
+    private Boolean active;
+    @ManyToMany(cascade = CascadeType.ALL)
+    @JoinTable(name = "trial_contact", joinColumns = {
+            @JoinColumn(name = "trial_db_id", referencedColumnName = "id")}, inverseJoinColumns = {
+            @JoinColumn(name = "person_db_id", referencedColumnName = "id")})
+    private List<PersonEntity> contacts;
+    @OneToMany(mappedBy = "trial")
+    private List<DatasetAuthorshipEntity> datasetAuthorships;
+    @Column
+    private String documentationURL;
+    @Column
+    private Date endDate;
+    @OneToMany(mappedBy = "trial")
+    private List<PublicationEntity> publications;
+    @Column
+    private Date startDate;
+    @Column
+    private String trialDescription;
+    @Column
+    private String trialName;
+    @Column
+    private String trialPUI;
+
+    @ManyToOne
+    private CropEntity crop;
+    @ManyToOne
+    private ProgramEntity program;
+
+    @OneToMany(mappedBy = "trial")
+    private List<StudyEntity> studies;
+    @OneToMany(mappedBy = "trial")
+    private List<ObservationUnitEntity> observationUnits;
+    @OneToMany(mappedBy = "trial")
+    private List<ObservationEntity> observations;
+
+    public CropEntity getCrop() {
+        return crop;
+    }
+
+    public void setCrop(CropEntity crop) {
+        this.crop = crop;
+    }
+
+    public List<ObservationUnitEntity> getObservationUnits() {
+        return observationUnits;
+    }
+
+    public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
+        this.observationUnits = observationUnits;
+    }
+
+    public List<ObservationEntity> getObservations() {
+        return observations;
+    }
+
+    public void setObservations(List<ObservationEntity> observations) {
+        this.observations = observations;
+    }
+
+    public Boolean isActive() {
+        return active;
+    }
+
+    public void setActive(Boolean active) {
+        this.active = active;
+    }
+
+    public List<PersonEntity> getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(List<PersonEntity> contacts) {
+        this.contacts = contacts;
+    }
+
+    public List<DatasetAuthorshipEntity> getDatasetAuthorships() {
+        return datasetAuthorships;
+    }
+
+    public void setDatasetAuthorships(List<DatasetAuthorshipEntity> datasetAuthorships) {
+        this.datasetAuthorships = datasetAuthorships;
+    }
+
+    public String getDocumentationURL() {
+        return documentationURL;
+    }
+
+    public void setDocumentationURL(String documentationURL) {
+        this.documentationURL = documentationURL;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public ProgramEntity getProgram() {
+        return program;
+    }
+
+    public void setProgram(ProgramEntity program) {
+        this.program = program;
+        if (program.getCrop() != null)
+            setCrop(program.getCrop());
+    }
+
+    public List<PublicationEntity> getPublications() {
+        return publications;
+    }
+
+    public void setPublications(List<PublicationEntity> publications) {
+        this.publications = publications;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getTrialDescription() {
+        return trialDescription;
+    }
+
+    public void setTrialDescription(String trialDescription) {
+        this.trialDescription = trialDescription;
+    }
+
+    public String getTrialName() {
+        return trialName;
+    }
+
+    public void setTrialName(String trialName) {
+        this.trialName = trialName;
+    }
+
+    public String getTrialPUI() {
+        return trialPUI;
+    }
+
+    public void setTrialPUI(String trialPUI) {
+        this.trialPUI = trialPUI;
+    }
+
+    public List<StudyEntity> getStudies() {
+        return studies;
+    }
+
+    public void setStudies(List<StudyEntity> studies) {
+        this.studies = studies;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/CallEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/CallEntity.java
index 9913469f..d708db39 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/CallEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/CallEntity.java
@@ -1,75 +1,86 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
 @Entity
-@Table(name="allele_call")
+@Table(name = "allele_call")
 public class CallEntity extends BrAPIPrimaryEntity {
-	@ManyToOne
-	private CallSetEntity callSet;
-	@Column
-	private String genotype;
-	@Column
-	private Integer readDepth;
-	@Column
-	private Double genotypeLikelihood;
-	@Column 
-	private String phaseSet;
-	@ManyToOne
-	private VariantEntity variant;
-
-	public CallEntity() {
-		super();
-	}
-	public CallEntity(CallEntity call) {
-		this.setCallSet(call.getCallSet());
-		this.setGenotype(call.getGenotype());
-		this.setReadDepth(call.getReadDepth());
-		this.setGenotypeLikelihood(call.getGenotypeLikelihood());
-		this.setId(call.getId());
-		this.setPhaseSet(call.getPhaseSet());
-		this.setVariant(call.getVariant());
-	}
-	
-	public Integer getReadDepth() {
-		return readDepth;
-	}
-	public void setReadDepth(Integer readDepth) {
-		this.readDepth = readDepth;
-	}
-	public CallSetEntity getCallSet() {
-		return callSet;
-	}
-	public void setCallSet(CallSetEntity callSet) {
-		this.callSet = callSet;
-	}
-	public String getGenotype() {
-		return genotype;
-	}
-	public void setGenotype(String genotype) {
-		this.genotype = genotype;
-	}
-	public Double getGenotypeLikelihood() {
-		return genotypeLikelihood;
-	}
-	public void setGenotypeLikelihood(Double genotypeLikelihood) {
-		this.genotypeLikelihood = genotypeLikelihood;
-	}
-	public String getPhaseSet() {
-		return phaseSet;
-	}
-	public void setPhaseSet(String phaseSet) {
-		this.phaseSet = phaseSet;
-	}
-	public VariantEntity getVariant() {
-		return variant;
-	}
-	public void setVariant(VariantEntity variant) {
-		this.variant = variant;
-	}
+    @ManyToOne
+    private CallSetEntity callSet;
+    @Column
+    private String genotype;
+    @Column
+    private Integer readDepth;
+    @Column
+    private Double genotypeLikelihood;
+    @Column
+    private String phaseSet;
+    @ManyToOne
+    private VariantEntity variant;
+
+    public CallEntity() {
+        super();
+    }
+
+    public CallEntity(CallEntity call) {
+        this.setCallSet(call.getCallSet());
+        this.setGenotype(call.getGenotype());
+        this.setReadDepth(call.getReadDepth());
+        this.setGenotypeLikelihood(call.getGenotypeLikelihood());
+        this.setId(call.getId());
+        this.setPhaseSet(call.getPhaseSet());
+        this.setVariant(call.getVariant());
+    }
+
+    public Integer getReadDepth() {
+        return readDepth;
+    }
+
+    public void setReadDepth(Integer readDepth) {
+        this.readDepth = readDepth;
+    }
+
+    public CallSetEntity getCallSet() {
+        return callSet;
+    }
+
+    public void setCallSet(CallSetEntity callSet) {
+        this.callSet = callSet;
+    }
+
+    public String getGenotype() {
+        return genotype;
+    }
+
+    public void setGenotype(String genotype) {
+        this.genotype = genotype;
+    }
+
+    public Double getGenotypeLikelihood() {
+        return genotypeLikelihood;
+    }
+
+    public void setGenotypeLikelihood(Double genotypeLikelihood) {
+        this.genotypeLikelihood = genotypeLikelihood;
+    }
+
+    public String getPhaseSet() {
+        return phaseSet;
+    }
+
+    public void setPhaseSet(String phaseSet) {
+        this.phaseSet = phaseSet;
+    }
+
+    public VariantEntity getVariant() {
+        return variant;
+    }
+
+    public void setVariant(VariantEntity variant) {
+        this.variant = variant;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/CallSetEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/CallSetEntity.java
index 9e2b855c..09fa7f09 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/CallSetEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/CallSetEntity.java
@@ -1,89 +1,81 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
+import jakarta.persistence.*;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
-
 @Entity
 @Table(name = "callset")
 public class CallSetEntity extends BrAPIPrimaryEntity {
-	@Column
-	private String callSetName;
-	@Column
-	private Date created;
-	@ManyToOne
-	private SampleEntity sample;
-	@Column
-	private Date updated;
-	@ManyToMany(cascade = CascadeType.ALL)
-	@JoinTable(name = "callset_variant_sets", 
-				joinColumns = { @JoinColumn(referencedColumnName = "id") }, 
-				inverseJoinColumns = {@JoinColumn(referencedColumnName = "id") })
-	private List<VariantSetEntity> variantSets;
-
-	public CallSetEntity() {
-		super();
-	}
-
-	public CallSetEntity(CallSetEntity callSet) {
-		this.setCallSetName(callSet.getCallSetName());
-		this.setCreated(callSet.getCreated());
-		this.setId(callSet.getId());
-		this.setSample(callSet.getSample());
-		this.setUpdated(callSet.getUpdated());
-		this.setVariantSets(new ArrayList<>());
-		this.getVariantSets().addAll(callSet.getVariantSets());
-	}
-
-	public Date getCreated() {
-		return created;
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public SampleEntity getSample() {
-		return sample;
-	}
-
-	public void setSample(SampleEntity sample) {
-		this.sample = sample;
-	}
-
-	public Date getUpdated() {
-		return updated;
-	}
-
-	public void setUpdated(Date updated) {
-		this.updated = updated;
-	}
-
-	public List<VariantSetEntity> getVariantSets() {
-		return variantSets;
-	}
-
-	public void setVariantSets(List<VariantSetEntity> variantSets) {
-		this.variantSets = variantSets;
-	}
-
-	public String getCallSetName() {
-		return callSetName;
-	}
-
-	public void setCallSetName(String callSetName) {
-		this.callSetName = callSetName;
-	}
+    @Column
+    private String callSetName;
+    @Column
+    private Date created;
+    @ManyToOne
+    private SampleEntity sample;
+    @Column
+    private Date updated;
+    @ManyToMany(cascade = CascadeType.ALL)
+    @JoinTable(name = "callset_variant_sets",
+            joinColumns = {@JoinColumn(referencedColumnName = "id")},
+            inverseJoinColumns = {@JoinColumn(referencedColumnName = "id")})
+    private List<VariantSetEntity> variantSets;
+
+    public CallSetEntity() {
+        super();
+    }
+
+    public CallSetEntity(CallSetEntity callSet) {
+        this.setCallSetName(callSet.getCallSetName());
+        this.setCreated(callSet.getCreated());
+        this.setId(callSet.getId());
+        this.setSample(callSet.getSample());
+        this.setUpdated(callSet.getUpdated());
+        this.setVariantSets(new ArrayList<>());
+        this.getVariantSets().addAll(callSet.getVariantSets());
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public SampleEntity getSample() {
+        return sample;
+    }
+
+    public void setSample(SampleEntity sample) {
+        this.sample = sample;
+    }
+
+    public Date getUpdated() {
+        return updated;
+    }
+
+    public void setUpdated(Date updated) {
+        this.updated = updated;
+    }
+
+    public List<VariantSetEntity> getVariantSets() {
+        return variantSets;
+    }
+
+    public void setVariantSets(List<VariantSetEntity> variantSets) {
+        this.variantSets = variantSets;
+    }
+
+    public String getCallSetName() {
+        return callSetName;
+    }
+
+    public void setCallSetName(String callSetName) {
+        this.callSetName = callSetName;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/GenomeMapEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/GenomeMapEntity.java
index 26c79a9b..937fc95a 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/GenomeMapEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/GenomeMapEntity.java
@@ -1,106 +1,118 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.CropEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.StudyEntity;
 
+import java.util.Date;
+import java.util.List;
+
 @Entity
-@Table(name="genome_map")
-public class GenomeMapEntity extends BrAPIPrimaryEntity{
-	@Column
-	private String comments;
-	@ManyToOne
-	private CropEntity crop;
-	@Column
-	private String documentationURL;
-	@OneToMany(mappedBy="genomeMap")
-	private List<LinkageGroupEntity> linkageGroups;
-	@Column
-	private String mapName;
-	@Column
-	private String mapPUI;
-	@Column
-	private Date publishedDate;
-	@Column
-	private String scientificName;
-	@ManyToMany
-	@JoinTable
-	private List<StudyEntity> studies;
-	@Column
-	private String type;
-	@Column
-	private String unit;
-	
-	public String getComments() {
-		return comments;
-	}
-	public void setComments(String comments) {
-		this.comments = comments;
-	}
-	public CropEntity getCrop() {
-		return crop;
-	}
-	public void setCrop(CropEntity crop) {
-		this.crop = crop;
-	}
-	public String getDocumentationURL() {
-		return documentationURL;
-	}
-	public void setDocumentationURL(String documentationURL) {
-		this.documentationURL = documentationURL;
-	}
-	public List<LinkageGroupEntity> getLinkageGroups() {
-		return linkageGroups;
-	}
-	public void setLinkageGroups(List<LinkageGroupEntity> linkageGroups) {
-		this.linkageGroups = linkageGroups;
-	}
-	public String getMapName() {
-		return mapName;
-	}
-	public void setMapName(String mapName) {
-		this.mapName = mapName;
-	}
-	public String getMapPUI() {
-		return mapPUI;
-	}
-	public void setMapPUI(String mapPUI) {
-		this.mapPUI = mapPUI;
-	}
-	public Date getPublishedDate() {
-		return publishedDate;
-	}
-	public void setPublishedDate(Date publishedDate) {
-		this.publishedDate = publishedDate;
-	}
-	public String getScientificName() {
-		return scientificName;
-	}
-	public void setScientificName(String scientificName) {
-		this.scientificName = scientificName;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	public String getUnit() {
-		return unit;
-	}
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-	
+@Table(name = "genome_map")
+public class GenomeMapEntity extends BrAPIPrimaryEntity {
+    @Column
+    private String comments;
+    @ManyToOne
+    private CropEntity crop;
+    @Column
+    private String documentationURL;
+    @OneToMany(mappedBy = "genomeMap")
+    private List<LinkageGroupEntity> linkageGroups;
+    @Column
+    private String mapName;
+    @Column
+    private String mapPUI;
+    @Column
+    private Date publishedDate;
+    @Column
+    private String scientificName;
+    @ManyToMany
+    @JoinTable
+    private List<StudyEntity> studies;
+    @Column
+    private String type;
+    @Column
+    private String unit;
+
+    public String getComments() {
+        return comments;
+    }
+
+    public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+    public CropEntity getCrop() {
+        return crop;
+    }
+
+    public void setCrop(CropEntity crop) {
+        this.crop = crop;
+    }
+
+    public String getDocumentationURL() {
+        return documentationURL;
+    }
+
+    public void setDocumentationURL(String documentationURL) {
+        this.documentationURL = documentationURL;
+    }
+
+    public List<LinkageGroupEntity> getLinkageGroups() {
+        return linkageGroups;
+    }
+
+    public void setLinkageGroups(List<LinkageGroupEntity> linkageGroups) {
+        this.linkageGroups = linkageGroups;
+    }
+
+    public String getMapName() {
+        return mapName;
+    }
+
+    public void setMapName(String mapName) {
+        this.mapName = mapName;
+    }
+
+    public String getMapPUI() {
+        return mapPUI;
+    }
+
+    public void setMapPUI(String mapPUI) {
+        this.mapPUI = mapPUI;
+    }
+
+    public Date getPublishedDate() {
+        return publishedDate;
+    }
+
+    public void setPublishedDate(Date publishedDate) {
+        this.publishedDate = publishedDate;
+    }
+
+    public String getScientificName() {
+        return scientificName;
+    }
+
+    public void setScientificName(String scientificName) {
+        this.scientificName = scientificName;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/LinkageGroupEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/LinkageGroupEntity.java
index 6ca7f2d7..a175bae5 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/LinkageGroupEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/LinkageGroupEntity.java
@@ -1,49 +1,51 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
+import jakarta.persistence.*;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+@Entity
+@Table(name = "linkageGroup")
+public class LinkageGroupEntity extends BrAPIPrimaryEntity {
+    @ManyToOne
+    private GenomeMapEntity genomeMap;
+    @Column
+    private String linkageGroupName;
+    @Column
+    private Integer maxMarkerPosition;
+    @OneToMany(mappedBy = "linkageGroup")
+    private List<MarkerPositionEntity> markers;
+
+    public Integer getMaxMarkerPosition() {
+        return maxMarkerPosition;
+    }
 
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+    public void setMaxMarkerPosition(Integer maxMarkerPosition) {
+        this.maxMarkerPosition = maxMarkerPosition;
+    }
 
-@Entity
-@Table(name="linkageGroup")
-public class LinkageGroupEntity extends BrAPIPrimaryEntity{
-	@ManyToOne
-	private GenomeMapEntity genomeMap;
-	@Column
-	private String linkageGroupName; 
-	@Column
-	private Integer maxMarkerPosition;
-	@OneToMany(mappedBy="linkageGroup")
-	private List<MarkerPositionEntity> markers;
-	
-	public Integer getMaxMarkerPosition() {
-		return maxMarkerPosition;
-	}
-	public void setMaxMarkerPosition(Integer maxMarkerPosition) {
-		this.maxMarkerPosition = maxMarkerPosition;
-	}
-	public GenomeMapEntity getGenomeMap() {
-		return genomeMap;
-	}
-	public void setGenomeMap(GenomeMapEntity genomeMap) {
-		this.genomeMap = genomeMap;
-	}
-	public String getLinkageGroupName() {
-		return linkageGroupName;
-	}
-	public void setLinkageGroupName(String linkageGroupName) {
-		this.linkageGroupName = linkageGroupName;
-	}
-	public List<MarkerPositionEntity> getMarkers() {
-		return markers;
-	}
-	public void setMarkers(List<MarkerPositionEntity> markers) {
-		this.markers = markers;
-	}
+    public GenomeMapEntity getGenomeMap() {
+        return genomeMap;
+    }
+
+    public void setGenomeMap(GenomeMapEntity genomeMap) {
+        this.genomeMap = genomeMap;
+    }
+
+    public String getLinkageGroupName() {
+        return linkageGroupName;
+    }
+
+    public void setLinkageGroupName(String linkageGroupName) {
+        this.linkageGroupName = linkageGroupName;
+    }
+
+    public List<MarkerPositionEntity> getMarkers() {
+        return markers;
+    }
+
+    public void setMarkers(List<MarkerPositionEntity> markers) {
+        this.markers = markers;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/MarkerPositionEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/MarkerPositionEntity.java
index 1da1b5b7..d76bf488 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/MarkerPositionEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/MarkerPositionEntity.java
@@ -1,38 +1,42 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
 @Entity
-@Table(name="marker_position")
-public class MarkerPositionEntity extends BrAPIPrimaryEntity{
-	@ManyToOne
-	private LinkageGroupEntity linkageGroup;
-	@ManyToOne	
-	private VariantEntity variant;
-	@Column
-	private Integer position;
-	
-	public LinkageGroupEntity getLinkageGroup() {
-		return linkageGroup;
-	}
-	public void setLinkageGroup(LinkageGroupEntity linkageGroup) {
-		this.linkageGroup = linkageGroup;
-	}
-	public VariantEntity getVariant() {
-		return variant;
-	}
-	public void setVariant(VariantEntity variant) {
-		this.variant = variant;
-	}
-	public Integer getPosition() {
-		return position;
-	}
-	public void setPosition(Integer position) {
-		this.position = position;
-	}
+@Table(name = "marker_position")
+public class MarkerPositionEntity extends BrAPIPrimaryEntity {
+    @ManyToOne
+    private LinkageGroupEntity linkageGroup;
+    @ManyToOne
+    private VariantEntity variant;
+    @Column
+    private Integer position;
+
+    public LinkageGroupEntity getLinkageGroup() {
+        return linkageGroup;
+    }
+
+    public void setLinkageGroup(LinkageGroupEntity linkageGroup) {
+        this.linkageGroup = linkageGroup;
+    }
+
+    public VariantEntity getVariant() {
+        return variant;
+    }
+
+    public void setVariant(VariantEntity variant) {
+        this.variant = variant;
+    }
+
+    public Integer getPosition() {
+        return position;
+    }
+
+    public void setPosition(Integer position) {
+        this.position = position;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/PlateEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/PlateEntity.java
index 8810a945..e7314060 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/PlateEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/PlateEntity.java
@@ -1,133 +1,150 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import io.swagger.model.geno.PlateFormat;
+import io.swagger.model.geno.SampleType;
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.ProgramEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.StudyEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.TrialEntity;
 import org.brapi.test.BrAPITestServer.model.entity.geno.vendor.VendorPlateSubmissionEntity;
 
-import io.swagger.model.geno.PlateFormat;
-import io.swagger.model.geno.SampleType;
+import java.util.Date;
+import java.util.List;
 
 @Entity
-@Table(name="plate")
-public class PlateEntity extends BrAPIPrimaryEntity{
-	@Column
+@Table(name = "plate")
+public class PlateEntity extends BrAPIPrimaryEntity {
+    @Column
     private String clientPlateDbId;
-	@Column
+    @Column
     private String clientPlateBarcode;
-	@Column
+    @Column
     private String plateName;
-	@Column
+    @Column
     private String plateBarcode;
-	@Column
-    private PlateFormat plateFormat ;
-	@Column
+    @Column
+    private PlateFormat plateFormat;
+    @Column
     private SampleType sampleType;
-	@Column
+    @Column
     private PlateFormat sampleSubmissionFormat;
-	@Column
+    @Column
     private Date statusTimeStamp;
-	@OneToMany(mappedBy="plate", cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "plate", cascade = CascadeType.ALL)
     private List<SampleEntity> samples;
-	@ManyToOne
-	private VendorPlateSubmissionEntity submission;	
-	@ManyToOne
-	private ProgramEntity program;		
-	@ManyToOne
-	private TrialEntity trial;		
-	@ManyToOne
-	private StudyEntity study;	
-	
-	public String getPlateBarcode() {
-		return plateBarcode;
-	}
-	public void setPlateBarcode(String plateBarcode) {
-		this.plateBarcode = plateBarcode;
-	}
-	public PlateFormat getPlateFormat() {
-		return plateFormat;
-	}
-	public void setPlateFormat(PlateFormat plateFormat) {
-		this.plateFormat = plateFormat;
-	}
-	public SampleType getSampleType() {
-		return sampleType;
-	}
-	public void setSampleType(SampleType sampleType) {
-		this.sampleType = sampleType;
-	}
-	public ProgramEntity getProgram() {
-		return program;
-	}
-	public void setProgram(ProgramEntity program) {
-		this.program = program;
-	}
-	public TrialEntity getTrial() {
-		return trial;
-	}
-	public void setTrial(TrialEntity trial) {
-		this.trial = trial;
-	}
-	public StudyEntity getStudy() {
-		return study;
-	}
-	public void setStudy(StudyEntity study) {
-		this.study = study;
-	}
-	public String getPlateName() {
-		return plateName;
-	}
-	public void setPlateName(String plateName) {
-		this.plateName = plateName;
-	}
-	public VendorPlateSubmissionEntity getSubmission() {
-		return submission;
-	}
-	public void setSubmission(VendorPlateSubmissionEntity submission) {
-		this.submission = submission;
-	}
-	public String getClientPlateDbId() {
-		return clientPlateDbId;
-	}
-	public void setClientPlateDbId(String clientPlateDbId) {
-		this.clientPlateDbId = clientPlateDbId;
-	}
-	public String getClientPlateBarcode() {
-		return clientPlateBarcode;
-	}
-	public void setClientPlateBarcode(String clientPlateBarcode) {
-		this.clientPlateBarcode = clientPlateBarcode;
-	}
-	public PlateFormat getSampleSubmissionFormat() {
-		return sampleSubmissionFormat;
-	}
-	public void setSampleSubmissionFormat(PlateFormat sampleSubmissionFormat) {
-		this.sampleSubmissionFormat = sampleSubmissionFormat;
-	}
-	public Date getStatusTimeStamp() {
-		return statusTimeStamp;
-	}
-	public void setStatusTimeStamp(Date statusTimeStamp) {
-		this.statusTimeStamp = statusTimeStamp;
-	}
-	public List<SampleEntity> getSamples() {
-		return samples;
-	}
-	public void setSamples(List<SampleEntity> samples) {
-		this.samples = samples;
-	}
-	
-	
+    @ManyToOne
+    private VendorPlateSubmissionEntity submission;
+    @ManyToOne
+    private ProgramEntity program;
+    @ManyToOne
+    private TrialEntity trial;
+    @ManyToOne
+    private StudyEntity study;
+
+    public String getPlateBarcode() {
+        return plateBarcode;
+    }
+
+    public void setPlateBarcode(String plateBarcode) {
+        this.plateBarcode = plateBarcode;
+    }
+
+    public PlateFormat getPlateFormat() {
+        return plateFormat;
+    }
+
+    public void setPlateFormat(PlateFormat plateFormat) {
+        this.plateFormat = plateFormat;
+    }
+
+    public SampleType getSampleType() {
+        return sampleType;
+    }
+
+    public void setSampleType(SampleType sampleType) {
+        this.sampleType = sampleType;
+    }
+
+    public ProgramEntity getProgram() {
+        return program;
+    }
+
+    public void setProgram(ProgramEntity program) {
+        this.program = program;
+    }
+
+    public TrialEntity getTrial() {
+        return trial;
+    }
+
+    public void setTrial(TrialEntity trial) {
+        this.trial = trial;
+    }
+
+    public StudyEntity getStudy() {
+        return study;
+    }
+
+    public void setStudy(StudyEntity study) {
+        this.study = study;
+    }
+
+    public String getPlateName() {
+        return plateName;
+    }
+
+    public void setPlateName(String plateName) {
+        this.plateName = plateName;
+    }
+
+    public VendorPlateSubmissionEntity getSubmission() {
+        return submission;
+    }
+
+    public void setSubmission(VendorPlateSubmissionEntity submission) {
+        this.submission = submission;
+    }
+
+    public String getClientPlateDbId() {
+        return clientPlateDbId;
+    }
+
+    public void setClientPlateDbId(String clientPlateDbId) {
+        this.clientPlateDbId = clientPlateDbId;
+    }
+
+    public String getClientPlateBarcode() {
+        return clientPlateBarcode;
+    }
+
+    public void setClientPlateBarcode(String clientPlateBarcode) {
+        this.clientPlateBarcode = clientPlateBarcode;
+    }
+
+    public PlateFormat getSampleSubmissionFormat() {
+        return sampleSubmissionFormat;
+    }
+
+    public void setSampleSubmissionFormat(PlateFormat sampleSubmissionFormat) {
+        this.sampleSubmissionFormat = sampleSubmissionFormat;
+    }
+
+    public Date getStatusTimeStamp() {
+        return statusTimeStamp;
+    }
+
+    public void setStatusTimeStamp(Date statusTimeStamp) {
+        this.statusTimeStamp = statusTimeStamp;
+    }
+
+    public List<SampleEntity> getSamples() {
+        return samples;
+    }
+
+    public void setSamples(List<SampleEntity> samples) {
+        this.samples = samples;
+    }
+
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceBasesPageEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceBasesPageEntity.java
index a67ee284..28c4f7fe 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceBasesPageEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceBasesPageEntity.java
@@ -1,34 +1,35 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
 @Entity
-@Table(name="reference_bases")
+@Table(name = "reference_bases")
 public class ReferenceBasesPageEntity extends BrAPIPrimaryEntity {
-	@ManyToOne
-	private ReferenceEntity reference;
-	@Column(length = 2048)
-	private String bases;
-	@Column
-	private Integer pageNumber;
-	
-	public ReferenceEntity getReference() {
-		return reference;
-	}
-	public void setReference(ReferenceEntity reference) {
-		this.reference = reference;
-	}
-	public String getBases() {
-		return bases;
-	}
-	public void setBases(String bases) {
-		this.bases = bases;
-	}
+    @ManyToOne
+    private ReferenceEntity reference;
+    @Column(length = 2048)
+    private String bases;
+    @Column
+    private Integer pageNumber;
+
+    public ReferenceEntity getReference() {
+        return reference;
+    }
+
+    public void setReference(ReferenceEntity reference) {
+        this.reference = reference;
+    }
+
+    public String getBases() {
+        return bases;
+    }
+
+    public void setBases(String bases) {
+        this.bases = bases;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceEntity.java
index 87f59000..1ea738f6 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceEntity.java
@@ -1,56 +1,66 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
-import java.math.BigDecimal;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
+import java.math.BigDecimal;
+
 
 @Entity
-@Table(name="reference")
+@Table(name = "reference")
 public class ReferenceEntity extends BrAPIPrimaryEntity {
-	@Column
-	private Integer length;
-	@Column
-	private String md5checksum;
-	@Column
-	private String referenceName;
-	@ManyToOne
-	private ReferenceSetEntity referenceSet;
-	@Column
-	private BigDecimal sourceDivergence;
-	
-	public Integer getLength() {
-		return length;
-	}
-	public void setLength(Integer length) {
-		this.length = length;
-	}
-	public String getMd5checksum() {
-		return md5checksum;
-	}
-	public void setMd5checksum(String md5checksum) {
-		this.md5checksum = md5checksum;
-	}
-	public String getReferenceName() {
-		return referenceName;
-	}
-	public void setReferenceName(String referenceName) {
-		this.referenceName = referenceName;
-	}
-	public ReferenceSetEntity getReferenceSet() {
-		return referenceSet;
-	}
-	public void setReferenceSet(ReferenceSetEntity referenceSet) {
-		this.referenceSet = referenceSet;
-	}
-	public BigDecimal getSourceDivergence() {
-		return sourceDivergence;
-	}
-	public void setSourceDivergence(BigDecimal sourceDivergence) {
-		this.sourceDivergence = sourceDivergence;
-	}
+    @Column
+    private Integer length;
+    @Column
+    private String md5checksum;
+    @Column
+    private String referenceName;
+    @ManyToOne
+    private ReferenceSetEntity referenceSet;
+    @Column
+    private BigDecimal sourceDivergence;
+
+    public Integer getLength() {
+        return length;
+    }
+
+    public void setLength(Integer length) {
+        this.length = length;
+    }
+
+    public String getMd5checksum() {
+        return md5checksum;
+    }
+
+    public void setMd5checksum(String md5checksum) {
+        this.md5checksum = md5checksum;
+    }
+
+    public String getReferenceName() {
+        return referenceName;
+    }
+
+    public void setReferenceName(String referenceName) {
+        this.referenceName = referenceName;
+    }
+
+    public ReferenceSetEntity getReferenceSet() {
+        return referenceSet;
+    }
+
+    public void setReferenceSet(ReferenceSetEntity referenceSet) {
+        this.referenceSet = referenceSet;
+    }
+
+    public BigDecimal getSourceDivergence() {
+        return sourceDivergence;
+    }
+
+    public void setSourceDivergence(BigDecimal sourceDivergence) {
+        this.sourceDivergence = sourceDivergence;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceSetEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceSetEntity.java
index f4eb86a9..65af6a15 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceSetEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/ReferenceSetEntity.java
@@ -1,87 +1,103 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.germ.GermplasmEntity;
 
 @Entity
-@Table(name="reference_set")
-public class ReferenceSetEntity extends BrAPIPrimaryEntity  {
-	@Column
-	private String assemblyPUI;
-	@Column
-	private String description;
-	@Column
-	private Boolean isDerived;
-	@Column
-	private String md5checksum;
-	@Column
-	private String referenceSetName;
-	@ManyToOne
-	private GermplasmEntity sourceGermplasm;
-	@Column
-	private String sourceURI;
-	@Column
-	private String speciesOntologyTerm;
-	@Column
-	private String speciesOntologyTermURI;
-	
-	public String getAssemblyPUI() {
-		return assemblyPUI;
-	}
-	public void setAssemblyPUI(String assemblyPUI) {
-		this.assemblyPUI = assemblyPUI;
-	}
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	public Boolean getIsDerived() {
-		return isDerived;
-	}
-	public void setIsDerived(Boolean isDerived) {
-		this.isDerived = isDerived;
-	}
-	public String getMd5checksum() {
-		return md5checksum;
-	}
-	public void setMd5checksum(String md5checksum) {
-		this.md5checksum = md5checksum;
-	}
-	public String getReferenceSetName() {
-		return referenceSetName;
-	}
-	public void setReferenceSetName(String referenceSetName) {
-		this.referenceSetName = referenceSetName;
-	}
-	public GermplasmEntity getSourceGermplasm() {
-		return sourceGermplasm;
-	}
-	public void setSourceGermplasm(GermplasmEntity sourceGermplasm) {
-		this.sourceGermplasm = sourceGermplasm;
-	}
-	public String getSourceURI() {
-		return sourceURI;
-	}
-	public void setSourceURI(String sourceURI) {
-		this.sourceURI = sourceURI;
-	}
-	public String getSpeciesOntologyTerm() {
-		return speciesOntologyTerm;
-	}
-	public void setSpeciesOntologyTerm(String speciesOntologyTerm) {
-		this.speciesOntologyTerm = speciesOntologyTerm;
-	}
-	public String getSpeciesOntologyTermURI() {
-		return speciesOntologyTermURI;
-	}
-	public void setSpeciesOntologyTermURI(String speciesOntologyTermURI) {
-		this.speciesOntologyTermURI = speciesOntologyTermURI;
-	}
+@Table(name = "reference_set")
+public class ReferenceSetEntity extends BrAPIPrimaryEntity {
+    @Column
+    private String assemblyPUI;
+    @Column
+    private String description;
+    @Column
+    private Boolean isDerived;
+    @Column
+    private String md5checksum;
+    @Column
+    private String referenceSetName;
+    @ManyToOne
+    private GermplasmEntity sourceGermplasm;
+    @Column
+    private String sourceURI;
+    @Column
+    private String speciesOntologyTerm;
+    @Column
+    private String speciesOntologyTermURI;
+
+    public String getAssemblyPUI() {
+        return assemblyPUI;
+    }
+
+    public void setAssemblyPUI(String assemblyPUI) {
+        this.assemblyPUI = assemblyPUI;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Boolean getIsDerived() {
+        return isDerived;
+    }
+
+    public void setIsDerived(Boolean isDerived) {
+        this.isDerived = isDerived;
+    }
+
+    public String getMd5checksum() {
+        return md5checksum;
+    }
+
+    public void setMd5checksum(String md5checksum) {
+        this.md5checksum = md5checksum;
+    }
+
+    public String getReferenceSetName() {
+        return referenceSetName;
+    }
+
+    public void setReferenceSetName(String referenceSetName) {
+        this.referenceSetName = referenceSetName;
+    }
+
+    public GermplasmEntity getSourceGermplasm() {
+        return sourceGermplasm;
+    }
+
+    public void setSourceGermplasm(GermplasmEntity sourceGermplasm) {
+        this.sourceGermplasm = sourceGermplasm;
+    }
+
+    public String getSourceURI() {
+        return sourceURI;
+    }
+
+    public void setSourceURI(String sourceURI) {
+        this.sourceURI = sourceURI;
+    }
+
+    public String getSpeciesOntologyTerm() {
+        return speciesOntologyTerm;
+    }
+
+    public void setSpeciesOntologyTerm(String speciesOntologyTerm) {
+        this.speciesOntologyTerm = speciesOntologyTerm;
+    }
+
+    public String getSpeciesOntologyTermURI() {
+        return speciesOntologyTermURI;
+    }
+
+    public void setSpeciesOntologyTermURI(String speciesOntologyTermURI) {
+        this.speciesOntologyTermURI = speciesOntologyTermURI;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/SampleEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/SampleEntity.java
index ef5c3e8d..5e3002d5 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/SampleEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/SampleEntity.java
@@ -1,13 +1,6 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.ProgramEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.StudyEntity;
@@ -15,168 +8,209 @@
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.TaxonEntity;
 
+import java.util.Date;
+
 @Entity
-@Table(name="sample")
-public class SampleEntity extends BrAPIPrimaryEntity{
-	@Column
-	private Integer plateColumn; 
-	@Column
-	private String concentration;
-	@ManyToOne
-	private ObservationUnitEntity observationUnit;
-	@ManyToOne
-	private ProgramEntity program;
-	@ManyToOne
-	private TrialEntity trial;
-	@ManyToOne
-	private StudyEntity study;
-	@ManyToOne
-	private PlateEntity plate;
-	@Column
-	private String plateRow; 
-	@Column
-	private String sampleBarcode; 
-	@Column
-	private String sampleDescription;
-	@Column
-	private String sampleGroupDbId;
-	@Column
-	private String sampleName;
-	@Column
-	private String samplePUI;
-	@Column
-	private Date sampleTimestamp;
-	@Column
-	private String sampleType;
-	@Column
-	private String takenBy;
-	@OneToOne
-	private TaxonEntity taxonId;
-	@Column
-	private String tissueType;
-	@Column
-	private String volume;
-	@Column
-	private String well;
-	
-	public ProgramEntity getProgram() {
-		return program;
-	}
-	public void setProgram(ProgramEntity program) {
-		this.program = program;
-	}
-	public TrialEntity getTrial() {
-		return trial;
-	}
-	public void setTrial(TrialEntity trial) {
-		this.trial = trial;
-	}
-	public StudyEntity getStudy() {
-		return study;
-	}
-	public void setStudy(StudyEntity study) {
-		this.study = study;
-	}
-	public String getWell() {
-		return well;
-	}
-	public void setWell(String well) {
-		this.well = well;
-	}
-	public String getSampleGroupDbId() {
-		return sampleGroupDbId;
-	}
-	public void setSampleGroupDbId(String sampleGroupDbId) {
-		this.sampleGroupDbId = sampleGroupDbId;
-	}
-	public String getConcentration() {
-		return concentration;
-	}
-	public void setConcentration(String concentration) {
-		this.concentration = concentration;
-	}
-	public ObservationUnitEntity getObservationUnit() {
-		return observationUnit;
-	}
-	public void setObservationUnit(ObservationUnitEntity observationUnit) {
-		this.observationUnit = observationUnit;
-	}
-	public PlateEntity getPlate() {
-		return plate;
-	}
-	public void setPlate(PlateEntity plate) {
-		this.plate = plate;
-	}
-	public Integer getPlateColumn() {
-		return plateColumn;
-	}
-	public void setPlateColumn(Integer plateColumn) {
-		this.plateColumn = plateColumn;
-	}
-	public String getPlateRow() {
-		return plateRow;
-	}
-	public void setPlateRow(String plateRow) {
-		this.plateRow = plateRow;
-	}
-	public String getSampleBarcode() {
-		return sampleBarcode;
-	}
-	public void setSampleBarcode(String sampleBarcode) {
-		this.sampleBarcode = sampleBarcode;
-	}
-	public String getSampleDescription() {
-		return sampleDescription;
-	}
-	public void setSampleDescription(String sampleDescription) {
-		this.sampleDescription = sampleDescription;
-	}
-	public String getSampleName() {
-		return sampleName;
-	}
-	public void setSampleName(String sampleName) {
-		this.sampleName = sampleName;
-	}
-	public String getSamplePUI() {
-		return samplePUI;
-	}
-	public void setSamplePUI(String samplePUI) {
-		this.samplePUI = samplePUI;
-	}
-	public Date getSampleTimestamp() {
-		return sampleTimestamp;
-	}
-	public void setSampleTimestamp(Date sampleTimestamp) {
-		this.sampleTimestamp = sampleTimestamp;
-	}
-	public String getSampleType() {
-		return sampleType;
-	}
-	public void setSampleType(String sampleType) {
-		this.sampleType = sampleType;
-	}
-	public String getTakenBy() {
-		return takenBy;
-	}
-	public void setTakenBy(String takenBy) {
-		this.takenBy = takenBy;
-	}
-	public TaxonEntity getTaxonId() {
-		return taxonId;
-	}
-	public void setTaxonId(TaxonEntity taxonId) {
-		this.taxonId = taxonId;
-	}
-	public String getTissueType() {
-		return tissueType;
-	}
-	public void setTissueType(String tissueType) {
-		this.tissueType = tissueType;
-	}
-	public String getVolume() {
-		return volume;
-	}
-	public void setVolume(String volume) {
-		this.volume = volume;
-	}
+@Table(name = "sample")
+public class SampleEntity extends BrAPIPrimaryEntity {
+    @Column
+    private Integer plateColumn;
+    @Column
+    private String concentration;
+    @ManyToOne
+    private ObservationUnitEntity observationUnit;
+    @ManyToOne
+    private ProgramEntity program;
+    @ManyToOne
+    private TrialEntity trial;
+    @ManyToOne
+    private StudyEntity study;
+    @ManyToOne
+    private PlateEntity plate;
+    @Column
+    private String plateRow;
+    @Column
+    private String sampleBarcode;
+    @Column
+    private String sampleDescription;
+    @Column
+    private String sampleGroupDbId;
+    @Column
+    private String sampleName;
+    @Column
+    private String samplePUI;
+    @Column
+    private Date sampleTimestamp;
+    @Column
+    private String sampleType;
+    @Column
+    private String takenBy;
+    @OneToOne
+    private TaxonEntity taxonId;
+    @Column
+    private String tissueType;
+    @Column
+    private String volume;
+    @Column
+    private String well;
+
+    public ProgramEntity getProgram() {
+        return program;
+    }
+
+    public void setProgram(ProgramEntity program) {
+        this.program = program;
+    }
+
+    public TrialEntity getTrial() {
+        return trial;
+    }
+
+    public void setTrial(TrialEntity trial) {
+        this.trial = trial;
+    }
+
+    public StudyEntity getStudy() {
+        return study;
+    }
+
+    public void setStudy(StudyEntity study) {
+        this.study = study;
+    }
+
+    public String getWell() {
+        return well;
+    }
+
+    public void setWell(String well) {
+        this.well = well;
+    }
+
+    public String getSampleGroupDbId() {
+        return sampleGroupDbId;
+    }
+
+    public void setSampleGroupDbId(String sampleGroupDbId) {
+        this.sampleGroupDbId = sampleGroupDbId;
+    }
+
+    public String getConcentration() {
+        return concentration;
+    }
+
+    public void setConcentration(String concentration) {
+        this.concentration = concentration;
+    }
+
+    public ObservationUnitEntity getObservationUnit() {
+        return observationUnit;
+    }
+
+    public void setObservationUnit(ObservationUnitEntity observationUnit) {
+        this.observationUnit = observationUnit;
+    }
+
+    public PlateEntity getPlate() {
+        return plate;
+    }
+
+    public void setPlate(PlateEntity plate) {
+        this.plate = plate;
+    }
+
+    public Integer getPlateColumn() {
+        return plateColumn;
+    }
+
+    public void setPlateColumn(Integer plateColumn) {
+        this.plateColumn = plateColumn;
+    }
+
+    public String getPlateRow() {
+        return plateRow;
+    }
+
+    public void setPlateRow(String plateRow) {
+        this.plateRow = plateRow;
+    }
+
+    public String getSampleBarcode() {
+        return sampleBarcode;
+    }
+
+    public void setSampleBarcode(String sampleBarcode) {
+        this.sampleBarcode = sampleBarcode;
+    }
+
+    public String getSampleDescription() {
+        return sampleDescription;
+    }
+
+    public void setSampleDescription(String sampleDescription) {
+        this.sampleDescription = sampleDescription;
+    }
+
+    public String getSampleName() {
+        return sampleName;
+    }
+
+    public void setSampleName(String sampleName) {
+        this.sampleName = sampleName;
+    }
+
+    public String getSamplePUI() {
+        return samplePUI;
+    }
+
+    public void setSamplePUI(String samplePUI) {
+        this.samplePUI = samplePUI;
+    }
+
+    public Date getSampleTimestamp() {
+        return sampleTimestamp;
+    }
+
+    public void setSampleTimestamp(Date sampleTimestamp) {
+        this.sampleTimestamp = sampleTimestamp;
+    }
+
+    public String getSampleType() {
+        return sampleType;
+    }
+
+    public void setSampleType(String sampleType) {
+        this.sampleType = sampleType;
+    }
+
+    public String getTakenBy() {
+        return takenBy;
+    }
+
+    public void setTakenBy(String takenBy) {
+        this.takenBy = takenBy;
+    }
+
+    public TaxonEntity getTaxonId() {
+        return taxonId;
+    }
+
+    public void setTaxonId(TaxonEntity taxonId) {
+        this.taxonId = taxonId;
+    }
+
+    public String getTissueType() {
+        return tissueType;
+    }
+
+    public void setTissueType(String tissueType) {
+        this.tissueType = tissueType;
+    }
+
+    public String getVolume() {
+        return volume;
+    }
+
+    public void setVolume(String volume) {
+        this.volume = volume;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantEntity.java
index 788dc88c..36b14375 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantEntity.java
@@ -1,206 +1,202 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
+import jakarta.persistence.*;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
-
 @Entity
 @Table(name = "variant")
 public class VariantEntity extends BrAPIPrimaryEntity {
-	@ElementCollection
-	private List<String> alternateBases;
-	@ElementCollection
-	private List<Integer> ciend;
-	@ElementCollection
-	private List<Integer> cipos;
-	@Column
-	private Date created;
-	@Column(name = "variantEnd")
-	private Integer end;
-	@Column
-	private Boolean filtersApplied;
-	@ElementCollection
-	private List<String> filtersFailed;
-	@Column
-	private Boolean filtersPassed;
-	@Column
-	private String referenceBases;
-	@ManyToOne
-	private ReferenceSetEntity referenceSet;
-	@Column(name = "variantStart")
-	private Integer start;
-	@Column
-	private Integer svlen;
-	@Column
-	private Date updated;
-	@Column
-	private String variantName;
-	@ManyToOne
-	private VariantSetEntity variantSet;
-	@Column
-	private String variantType;
-
-	public VariantEntity() {
-		super();
-	}
-
-	public VariantEntity(VariantEntity variant) {
-		this.setAlternateBases(new ArrayList<>());
-		this.getAlternateBases().addAll(variant.getAlternateBases());
-		this.setCiend(new ArrayList<>());
-		this.getCiend().addAll(variant.getCiend());
-		this.setCipos(new ArrayList<>());
-		this.getCipos().addAll(variant.getCipos());
-		this.setCreated(variant.getCreated());
-		this.setEnd(variant.getEnd());
-		this.setFiltersApplied(variant.getFiltersApplied());
-		this.setFiltersFailed(new ArrayList<>());
-		this.getFiltersFailed().addAll(variant.getFiltersFailed());
-		this.setFiltersPassed(variant.getFiltersPassed());
-		this.setId(variant.getId());
-		this.setReferenceBases(variant.getReferenceBases());
-		this.setReferenceSet(variant.getReferenceSet());
-		this.setStart(variant.getStart());
-		this.setSvlen(variant.getSvlen());
-		this.setUpdated(variant.getUpdated());
-		this.setVariantName(variant.getVariantName());
-		this.setVariantSet(variant.getVariantSet());
-		this.setVariantType(variant.getVariantType());
-	}
-
-	public List<String> getAlternateBases() {
-		return alternateBases;
-	}
-
-	public void setAlternateBases(List<String> alternateBases) {
-		this.alternateBases = alternateBases;
-	}
-
-	public List<Integer> getCiend() {
-		return ciend;
-	}
-
-	public void setCiend(List<Integer> ciend) {
-		this.ciend = ciend;
-	}
-
-	public List<Integer> getCipos() {
-		return cipos;
-	}
-
-	public void setCipos(List<Integer> cipos) {
-		this.cipos = cipos;
-	}
-
-	public Date getCreated() {
-		return created;
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Integer getEnd() {
-		return end;
-	}
-
-	public void setEnd(Integer end) {
-		this.end = end;
-	}
-
-	public Boolean getFiltersApplied() {
-		return filtersApplied;
-	}
-
-	public void setFiltersApplied(Boolean filtersApplied) {
-		this.filtersApplied = filtersApplied;
-	}
-
-	public List<String> getFiltersFailed() {
-		return filtersFailed;
-	}
-
-	public void setFiltersFailed(List<String> filtersFailed) {
-		this.filtersFailed = filtersFailed;
-	}
-
-	public Boolean getFiltersPassed() {
-		return filtersPassed;
-	}
-
-	public void setFiltersPassed(Boolean filtersPassed) {
-		this.filtersPassed = filtersPassed;
-	}
-
-	public String getReferenceBases() {
-		return referenceBases;
-	}
-
-	public void setReferenceBases(String referenceBases) {
-		this.referenceBases = referenceBases;
-	}
-
-	public ReferenceSetEntity getReferenceSet() {
-		return referenceSet;
-	}
-
-	public void setReferenceSet(ReferenceSetEntity referenceSet) {
-		this.referenceSet = referenceSet;
-	}
-
-	public Integer getStart() {
-		return start;
-	}
-
-	public void setStart(Integer start) {
-		this.start = start;
-	}
-
-	public Integer getSvlen() {
-		return svlen;
-	}
-
-	public void setSvlen(Integer svlen) {
-		this.svlen = svlen;
-	}
-
-	public Date getUpdated() {
-		return updated;
-	}
+    @ElementCollection
+    private List<String> alternateBases;
+    @ElementCollection
+    private List<Integer> ciend;
+    @ElementCollection
+    private List<Integer> cipos;
+    @Column
+    private Date created;
+    @Column(name = "variantEnd")
+    private Integer end;
+    @Column
+    private Boolean filtersApplied;
+    @ElementCollection
+    private List<String> filtersFailed;
+    @Column
+    private Boolean filtersPassed;
+    @Column
+    private String referenceBases;
+    @ManyToOne
+    private ReferenceSetEntity referenceSet;
+    @Column(name = "variantStart")
+    private Integer start;
+    @Column
+    private Integer svlen;
+    @Column
+    private Date updated;
+    @Column
+    private String variantName;
+    @ManyToOne
+    private VariantSetEntity variantSet;
+    @Column
+    private String variantType;
+
+    public VariantEntity() {
+        super();
+    }
+
+    public VariantEntity(VariantEntity variant) {
+        this.setAlternateBases(new ArrayList<>());
+        this.getAlternateBases().addAll(variant.getAlternateBases());
+        this.setCiend(new ArrayList<>());
+        this.getCiend().addAll(variant.getCiend());
+        this.setCipos(new ArrayList<>());
+        this.getCipos().addAll(variant.getCipos());
+        this.setCreated(variant.getCreated());
+        this.setEnd(variant.getEnd());
+        this.setFiltersApplied(variant.getFiltersApplied());
+        this.setFiltersFailed(new ArrayList<>());
+        this.getFiltersFailed().addAll(variant.getFiltersFailed());
+        this.setFiltersPassed(variant.getFiltersPassed());
+        this.setId(variant.getId());
+        this.setReferenceBases(variant.getReferenceBases());
+        this.setReferenceSet(variant.getReferenceSet());
+        this.setStart(variant.getStart());
+        this.setSvlen(variant.getSvlen());
+        this.setUpdated(variant.getUpdated());
+        this.setVariantName(variant.getVariantName());
+        this.setVariantSet(variant.getVariantSet());
+        this.setVariantType(variant.getVariantType());
+    }
+
+    public List<String> getAlternateBases() {
+        return alternateBases;
+    }
+
+    public void setAlternateBases(List<String> alternateBases) {
+        this.alternateBases = alternateBases;
+    }
+
+    public List<Integer> getCiend() {
+        return ciend;
+    }
+
+    public void setCiend(List<Integer> ciend) {
+        this.ciend = ciend;
+    }
+
+    public List<Integer> getCipos() {
+        return cipos;
+    }
+
+    public void setCipos(List<Integer> cipos) {
+        this.cipos = cipos;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public Integer getEnd() {
+        return end;
+    }
+
+    public void setEnd(Integer end) {
+        this.end = end;
+    }
+
+    public Boolean getFiltersApplied() {
+        return filtersApplied;
+    }
+
+    public void setFiltersApplied(Boolean filtersApplied) {
+        this.filtersApplied = filtersApplied;
+    }
+
+    public List<String> getFiltersFailed() {
+        return filtersFailed;
+    }
+
+    public void setFiltersFailed(List<String> filtersFailed) {
+        this.filtersFailed = filtersFailed;
+    }
+
+    public Boolean getFiltersPassed() {
+        return filtersPassed;
+    }
+
+    public void setFiltersPassed(Boolean filtersPassed) {
+        this.filtersPassed = filtersPassed;
+    }
+
+    public String getReferenceBases() {
+        return referenceBases;
+    }
+
+    public void setReferenceBases(String referenceBases) {
+        this.referenceBases = referenceBases;
+    }
+
+    public ReferenceSetEntity getReferenceSet() {
+        return referenceSet;
+    }
+
+    public void setReferenceSet(ReferenceSetEntity referenceSet) {
+        this.referenceSet = referenceSet;
+    }
+
+    public Integer getStart() {
+        return start;
+    }
+
+    public void setStart(Integer start) {
+        this.start = start;
+    }
+
+    public Integer getSvlen() {
+        return svlen;
+    }
+
+    public void setSvlen(Integer svlen) {
+        this.svlen = svlen;
+    }
+
+    public Date getUpdated() {
+        return updated;
+    }
 
-	public void setUpdated(Date updated) {
-		this.updated = updated;
-	}
+    public void setUpdated(Date updated) {
+        this.updated = updated;
+    }
 
-	public String getVariantType() {
-		return variantType;
-	}
+    public String getVariantType() {
+        return variantType;
+    }
 
-	public void setVariantType(String variantType) {
-		this.variantType = variantType;
-	}
+    public void setVariantType(String variantType) {
+        this.variantType = variantType;
+    }
 
-	public String getVariantName() {
-		return variantName;
-	}
+    public String getVariantName() {
+        return variantName;
+    }
 
-	public void setVariantName(String variantName) {
-		this.variantName = variantName;
-	}
+    public void setVariantName(String variantName) {
+        this.variantName = variantName;
+    }
 
-	public VariantSetEntity getVariantSet() {
-		return variantSet;
-	}
+    public VariantSetEntity getVariantSet() {
+        return variantSet;
+    }
 
-	public void setVariantSet(VariantSetEntity variantSet) {
-		this.variantSet = variantSet;
-	}
+    public void setVariantSet(VariantSetEntity variantSet) {
+        this.variantSet = variantSet;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetAnalysisEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetAnalysisEntity.java
index 227e64b9..21fc6fa3 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetAnalysisEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetAnalysisEntity.java
@@ -1,73 +1,82 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
+import jakarta.persistence.*;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+
 import java.util.Date;
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
-
 @Entity
 @Table(name = "variantset_analysis")
 public class VariantSetAnalysisEntity extends BrAPIBaseEntity {
-	@ManyToOne
-	private VariantSetEntity variantSet;
-	@Column
-	private String analysisName;
-	@Column
-	private Date created;
-	@Column
-	private String description;
-	@ElementCollection
-	private List<String> software;
-	@Column
-	private String type;
-	@Column
-	private Date updated;
-	
-	public VariantSetEntity getVariantSet() {
-		return variantSet;
-	}
-	public void setVariantSet(VariantSetEntity variantSet) {
-		this.variantSet = variantSet;
-	}
-	public String getAnalysisName() {
-		return analysisName;
-	}
-	public void setAnalysisName(String analysisName) {
-		this.analysisName = analysisName;
-	}
-	public Date getCreated() {
-		return created;
-	}
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	public List<String> getSoftware() {
-		return software;
-	}
-	public void setSoftware(List<String> software) {
-		this.software = software;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	public Date getUpdated() {
-		return updated;
-	}
-	public void setUpdated(Date updated) {
-		this.updated = updated;
-	}
+    @ManyToOne
+    private VariantSetEntity variantSet;
+    @Column
+    private String analysisName;
+    @Column
+    private Date created;
+    @Column
+    private String description;
+    @ElementCollection
+    private List<String> software;
+    @Column
+    private String type;
+    @Column
+    private Date updated;
+
+    public VariantSetEntity getVariantSet() {
+        return variantSet;
+    }
+
+    public void setVariantSet(VariantSetEntity variantSet) {
+        this.variantSet = variantSet;
+    }
+
+    public String getAnalysisName() {
+        return analysisName;
+    }
+
+    public void setAnalysisName(String analysisName) {
+        this.analysisName = analysisName;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List<String> getSoftware() {
+        return software;
+    }
+
+    public void setSoftware(List<String> software) {
+        this.software = software;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Date getUpdated() {
+        return updated;
+    }
+
+    public void setUpdated(Date updated) {
+        this.updated = updated;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetAvailableFormatEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetAvailableFormatEntity.java
index cd2b1e70..ff825212 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetAvailableFormatEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetAvailableFormatEntity.java
@@ -1,83 +1,94 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import io.swagger.model.WSMIMEDataTypes;
 import io.swagger.model.geno.GenoFileDataFormatEnum;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "variantset_format")
 public class VariantSetAvailableFormatEntity extends BrAPIBaseEntity {
-	@ManyToOne
-	private VariantSetEntity variantSet;
-	@Column
-	private GenoFileDataFormatEnum dataFormat;
-	@Column
-	private WSMIMEDataTypes fileFormat;
-	@Column
-	private String fileURL;
-	@Column
-	private Boolean expandHomozygotes;
-	@Column
-	private String sepPhased;
-	@Column
-	private String sepUnphased;
-	@Column
-	private String unknownString;
-	
-	public Boolean getExpandHomozygotes() {
-		return expandHomozygotes;
-	}
-	public void setExpandHomozygotes(Boolean expandHomozygotes) {
-		this.expandHomozygotes = expandHomozygotes;
-	}
-	public String getSepPhased() {
-		return sepPhased;
-	}
-	public void setSepPhased(String sepPhased) {
-		this.sepPhased = sepPhased;
-	}
-	public String getSepUnphased() {
-		return sepUnphased;
-	}
-	public void setSepUnphased(String sepUnphased) {
-		this.sepUnphased = sepUnphased;
-	}
-	public String getUnknownString() {
-		return unknownString;
-	}
-	public void setUnknownString(String unknownString) {
-		this.unknownString = unknownString;
-	}
-	public VariantSetEntity getVariantSet() {
-		return variantSet;
-	}
-	public void setVariantSet(VariantSetEntity variantSet) {
-		this.variantSet = variantSet;
-	}
-	public GenoFileDataFormatEnum getDataFormat() {
-		return dataFormat;
-	}
-	public void setDataFormat(GenoFileDataFormatEnum dataFormat) {
-		this.dataFormat = dataFormat;
-	}
-	public WSMIMEDataTypes getFileFormat() {
-		return fileFormat;
-	}
-	public void setFileFormat(WSMIMEDataTypes fileFormat) {
-		this.fileFormat = fileFormat;
-	}
-	public String getFileURL() {
-		return fileURL;
-	}
-	public void setFileURL(String fileURL) {
-		this.fileURL = fileURL;
-	}
+    @ManyToOne
+    private VariantSetEntity variantSet;
+    @Column
+    private GenoFileDataFormatEnum dataFormat;
+    @Column
+    private WSMIMEDataTypes fileFormat;
+    @Column
+    private String fileURL;
+    @Column
+    private Boolean expandHomozygotes;
+    @Column
+    private String sepPhased;
+    @Column
+    private String sepUnphased;
+    @Column
+    private String unknownString;
+
+    public Boolean getExpandHomozygotes() {
+        return expandHomozygotes;
+    }
+
+    public void setExpandHomozygotes(Boolean expandHomozygotes) {
+        this.expandHomozygotes = expandHomozygotes;
+    }
+
+    public String getSepPhased() {
+        return sepPhased;
+    }
+
+    public void setSepPhased(String sepPhased) {
+        this.sepPhased = sepPhased;
+    }
+
+    public String getSepUnphased() {
+        return sepUnphased;
+    }
+
+    public void setSepUnphased(String sepUnphased) {
+        this.sepUnphased = sepUnphased;
+    }
+
+    public String getUnknownString() {
+        return unknownString;
+    }
+
+    public void setUnknownString(String unknownString) {
+        this.unknownString = unknownString;
+    }
+
+    public VariantSetEntity getVariantSet() {
+        return variantSet;
+    }
+
+    public void setVariantSet(VariantSetEntity variantSet) {
+        this.variantSet = variantSet;
+    }
+
+    public GenoFileDataFormatEnum getDataFormat() {
+        return dataFormat;
+    }
+
+    public void setDataFormat(GenoFileDataFormatEnum dataFormat) {
+        this.dataFormat = dataFormat;
+    }
+
+    public WSMIMEDataTypes getFileFormat() {
+        return fileFormat;
+    }
+
+    public void setFileFormat(WSMIMEDataTypes fileFormat) {
+        this.fileFormat = fileFormat;
+    }
+
+    public String getFileURL() {
+        return fileURL;
+    }
+
+    public void setFileURL(String fileURL) {
+        this.fileURL = fileURL;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetEntity.java
index d40daf63..1aff8616 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/VariantSetEntity.java
@@ -1,77 +1,82 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno;
 
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.StudyEntity;
 
+import java.util.List;
+
 @Entity
 @Table(name = "variantset")
 public class VariantSetEntity extends BrAPIPrimaryEntity {
-	@OneToMany(mappedBy = "variantSet")
-	private List<VariantSetAnalysisEntity> analysis;
-	@OneToMany(mappedBy = "variantSet")
-	private List<VariantSetAvailableFormatEntity> availableFormats;
-	@ManyToMany(mappedBy = "variantSets")
-	private List<CallSetEntity> callSets;
-	@ManyToOne
-	private ReferenceSetEntity referenceSet;
-	@ManyToOne
-	private StudyEntity study;
-	@OneToMany(mappedBy = "variantSet")
-	private List<VariantEntity> variants;
-	@Column
-	private String variantSetName;
-	
-	public List<VariantSetAnalysisEntity> getAnalysis() {
-		return analysis;
-	}
-	public void setAnalysis(List<VariantSetAnalysisEntity> analysis) {
-		this.analysis = analysis;
-	}
-	public List<VariantSetAvailableFormatEntity> getAvailableFormats() {
-		return availableFormats;
-	}
-	public void setAvailableFormats(List<VariantSetAvailableFormatEntity> availableFormats) {
-		this.availableFormats = availableFormats;
-	}
-	public List<CallSetEntity> getCallSets() {
-		return callSets;
-	}
-	public void setCallSets(List<CallSetEntity> callSets) {
-		this.callSets = callSets;
-	}
-	public ReferenceSetEntity getReferenceSet() {
-		return referenceSet;
-	}
-	public void setReferenceSet(ReferenceSetEntity referenceSet) {
-		this.referenceSet = referenceSet;
-	}
-	public StudyEntity getStudy() {
-		return study;
-	}
-	public void setStudy(StudyEntity study) {
-		this.study = study;
-	}
-	public List<VariantEntity> getVariants() {
-		return variants;
-	}
-	public void setVariants(List<VariantEntity> variants) {
-		this.variants = variants;
-	}
-	public String getVariantSetName() {
-		return variantSetName;
-	}
-	public void setVariantSetName(String variantSetName) {
-		this.variantSetName = variantSetName;
-	}
+    @OneToMany(mappedBy = "variantSet")
+    private List<VariantSetAnalysisEntity> analysis;
+    @OneToMany(mappedBy = "variantSet")
+    private List<VariantSetAvailableFormatEntity> availableFormats;
+    @ManyToMany(mappedBy = "variantSets")
+    private List<CallSetEntity> callSets;
+    @ManyToOne
+    private ReferenceSetEntity referenceSet;
+    @ManyToOne
+    private StudyEntity study;
+    @OneToMany(mappedBy = "variantSet")
+    private List<VariantEntity> variants;
+    @Column
+    private String variantSetName;
+
+    public List<VariantSetAnalysisEntity> getAnalysis() {
+        return analysis;
+    }
+
+    public void setAnalysis(List<VariantSetAnalysisEntity> analysis) {
+        this.analysis = analysis;
+    }
+
+    public List<VariantSetAvailableFormatEntity> getAvailableFormats() {
+        return availableFormats;
+    }
+
+    public void setAvailableFormats(List<VariantSetAvailableFormatEntity> availableFormats) {
+        this.availableFormats = availableFormats;
+    }
+
+    public List<CallSetEntity> getCallSets() {
+        return callSets;
+    }
+
+    public void setCallSets(List<CallSetEntity> callSets) {
+        this.callSets = callSets;
+    }
+
+    public ReferenceSetEntity getReferenceSet() {
+        return referenceSet;
+    }
+
+    public void setReferenceSet(ReferenceSetEntity referenceSet) {
+        this.referenceSet = referenceSet;
+    }
+
+    public StudyEntity getStudy() {
+        return study;
+    }
+
+    public void setStudy(StudyEntity study) {
+        this.study = study;
+    }
+
+    public List<VariantEntity> getVariants() {
+        return variants;
+    }
+
+    public void setVariants(List<VariantEntity> variants) {
+        this.variants = variants;
+    }
+
+    public String getVariantSetName() {
+        return variantSetName;
+    }
+
+    public void setVariantSetName(String variantSetName) {
+        this.variantSetName = variantSetName;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorFileEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorFileEntity.java
index 1380e82f..4b357076 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorFileEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorFileEntity.java
@@ -1,83 +1,75 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 import org.brapi.test.BrAPITestServer.model.entity.geno.SampleEntity;
 
+import java.util.List;
+
 @Entity
 @Table(name = "vendor_file")
 public class VendorFileEntity extends BrAPIBaseEntity {
-	@Column
-	private String filename;
-	@Column
-	private String URL;
-	@Column
-	private String md5sum;
-	@Column
-	private String fileType;
-	@ManyToOne
-	private VendorOrderEntity order;
-	@ManyToMany(cascade= CascadeType.ALL)
-	@JoinTable(name = "vendor_file_sample", joinColumns = {
-			@JoinColumn(name = "verndor_file_dbid", referencedColumnName = "id") }, inverseJoinColumns = {
-					@JoinColumn(name = "sample_dbid", referencedColumnName = "id") })
-	private List<SampleEntity> samples;
-
-	public VendorOrderEntity getOrder() {
-		return order;
-	}
-
-	public void setOrder(VendorOrderEntity order) {
-		this.order = order;
-	}
-
-	public String getFilename() {
-		return filename;
-	}
-
-	public void setFilename(String filename) {
-		this.filename = filename;
-	}
-
-	public String getURL() {
-		return URL;
-	}
-
-	public void setURL(String uRL) {
-		URL = uRL;
-	}
-
-	public String getMd5sum() {
-		return md5sum;
-	}
-
-	public void setMd5sum(String md5sum) {
-		this.md5sum = md5sum;
-	}
-
-	public String getFileType() {
-		return fileType;
-	}
-
-	public void setFileType(String fileType) {
-		this.fileType = fileType;
-	}
-
-	public List<SampleEntity> getSamples() {
-		return samples;
-	}
-
-	public void setSamples(List<SampleEntity> samples) {
-		this.samples = samples;
-	}
+    @Column
+    private String filename;
+    @Column
+    private String URL;
+    @Column
+    private String md5sum;
+    @Column
+    private String fileType;
+    @ManyToOne
+    private VendorOrderEntity order;
+    @ManyToMany(cascade = CascadeType.ALL)
+    @JoinTable(name = "vendor_file_sample", joinColumns = {
+            @JoinColumn(name = "verndor_file_dbid", referencedColumnName = "id")}, inverseJoinColumns = {
+            @JoinColumn(name = "sample_dbid", referencedColumnName = "id")})
+    private List<SampleEntity> samples;
+
+    public VendorOrderEntity getOrder() {
+        return order;
+    }
+
+    public void setOrder(VendorOrderEntity order) {
+        this.order = order;
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+
+    public void setFilename(String filename) {
+        this.filename = filename;
+    }
+
+    public String getURL() {
+        return URL;
+    }
+
+    public void setURL(String uRL) {
+        URL = uRL;
+    }
+
+    public String getMd5sum() {
+        return md5sum;
+    }
+
+    public void setMd5sum(String md5sum) {
+        this.md5sum = md5sum;
+    }
+
+    public String getFileType() {
+        return fileType;
+    }
+
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
+
+    public List<SampleEntity> getSamples() {
+        return samples;
+    }
+
+    public void setSamples(List<SampleEntity> samples) {
+        this.samples = samples;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorOrderEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorOrderEntity.java
index 5b43eeb4..e6642365 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorOrderEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorOrderEntity.java
@@ -1,100 +1,108 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
+import io.swagger.model.geno.VendorOrderStatusResponseResult.StatusEnum;
+import io.swagger.model.geno.VendorPlateSubmissionRequest.SampleTypeEnum;
+import jakarta.persistence.*;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
-
-import io.swagger.model.geno.VendorOrderStatusResponseResult.StatusEnum;
-import io.swagger.model.geno.VendorPlateSubmissionRequest.SampleTypeEnum;
-
 @Entity
-@Table(name="vendor_order")
-public class VendorOrderEntity extends BrAPIPrimaryEntity{
-	@Column
+@Table(name = "vendor_order")
+public class VendorOrderEntity extends BrAPIPrimaryEntity {
+    @Column
     private String clientPlateDbId;
-	@Column
+    @Column
     private String clientPlateBarcode;
-	@Column
+    @Column
     private SampleTypeEnum sampleType;
-	@Column
+    @Column
     private StatusEnum status;
-	@Column
+    @Column
     private Date statusTimeStamp;
-	@OneToOne(cascade = CascadeType.ALL, mappedBy= "order")
+    @OneToOne(cascade = CascadeType.ALL, mappedBy = "order")
     private VendorPlateSubmissionEntity plateSubmission;
-	@OneToMany(mappedBy="order", cascade = CascadeType.ALL)
-	private List<VendorFileEntity> files;
-	@ElementCollection
-	private Map<String, String> requiredServiceInfo;
-	@ElementCollection
-	private List<String> serviceIds;
-	
-	
-	public SampleTypeEnum getSampleType() {
-		return sampleType;
-	}
-	public void setSampleType(SampleTypeEnum sampleType) {
-		this.sampleType = sampleType;
-	}
-	public StatusEnum getStatus() {
-		return status;
-	}
-	public void setStatus(StatusEnum status) {
-		this.status = status;
-	}
-	public Map<String, String> getRequiredServiceInfo() {
-		return requiredServiceInfo;
-	}
-	public void setRequiredServiceInfo(Map<String, String> requiredServiceInfo) {
-		this.requiredServiceInfo = requiredServiceInfo;
-	}
-	public List<String> getServiceIds() {
-		return serviceIds;
-	}
-	public void setServiceIds(List<String> serviceIds) {
-		this.serviceIds = serviceIds;
-	}
-	public VendorPlateSubmissionEntity getPlateSubmission() {
-		return plateSubmission;
-	}
-	public void setPlateSubmission(VendorPlateSubmissionEntity plateSubmission) {
-		this.plateSubmission = plateSubmission;
-	}
-	public String getClientPlateDbId() {
-		return clientPlateDbId;
-	}
-	public void setClientPlateDbId(String clientPlateDbId) {
-		this.clientPlateDbId = clientPlateDbId;
-	}
-	public String getClientPlateBarcode() {
-		return clientPlateBarcode;
-	}
-	public void setClientPlateBarcode(String clientPlateBarcode) {
-		this.clientPlateBarcode = clientPlateBarcode;
-	}
-	public Date getStatusTimeStamp() {
-		return statusTimeStamp;
-	}
-	public void setStatusTimeStamp(Date statusTimeStamp) {
-		this.statusTimeStamp = statusTimeStamp;
-	}
-	public List<VendorFileEntity> getFiles() {
-		return files;
-	}
-	public void setFiles(List<VendorFileEntity> files) {
-		this.files = files;
-	}
-	
-	
+    @OneToMany(mappedBy = "order", cascade = CascadeType.ALL)
+    private List<VendorFileEntity> files;
+    @ElementCollection
+    private Map<String, String> requiredServiceInfo;
+    @ElementCollection
+    private List<String> serviceIds;
+
+
+    public SampleTypeEnum getSampleType() {
+        return sampleType;
+    }
+
+    public void setSampleType(SampleTypeEnum sampleType) {
+        this.sampleType = sampleType;
+    }
+
+    public StatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(StatusEnum status) {
+        this.status = status;
+    }
+
+    public Map<String, String> getRequiredServiceInfo() {
+        return requiredServiceInfo;
+    }
+
+    public void setRequiredServiceInfo(Map<String, String> requiredServiceInfo) {
+        this.requiredServiceInfo = requiredServiceInfo;
+    }
+
+    public List<String> getServiceIds() {
+        return serviceIds;
+    }
+
+    public void setServiceIds(List<String> serviceIds) {
+        this.serviceIds = serviceIds;
+    }
+
+    public VendorPlateSubmissionEntity getPlateSubmission() {
+        return plateSubmission;
+    }
+
+    public void setPlateSubmission(VendorPlateSubmissionEntity plateSubmission) {
+        this.plateSubmission = plateSubmission;
+    }
+
+    public String getClientPlateDbId() {
+        return clientPlateDbId;
+    }
+
+    public void setClientPlateDbId(String clientPlateDbId) {
+        this.clientPlateDbId = clientPlateDbId;
+    }
+
+    public String getClientPlateBarcode() {
+        return clientPlateBarcode;
+    }
+
+    public void setClientPlateBarcode(String clientPlateBarcode) {
+        this.clientPlateBarcode = clientPlateBarcode;
+    }
+
+    public Date getStatusTimeStamp() {
+        return statusTimeStamp;
+    }
+
+    public void setStatusTimeStamp(Date statusTimeStamp) {
+        this.statusTimeStamp = statusTimeStamp;
+    }
+
+    public List<VendorFileEntity> getFiles() {
+        return files;
+    }
+
+    public void setFiles(List<VendorFileEntity> files) {
+        this.files = files;
+    }
+
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorPlateSubmissionEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorPlateSubmissionEntity.java
index f3bc26ce..11600300 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorPlateSubmissionEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorPlateSubmissionEntity.java
@@ -1,65 +1,66 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import io.swagger.model.geno.VendorPlateSubmissionRequest.SampleTypeEnum;
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.geno.PlateEntity;
 
-import io.swagger.model.geno.VendorPlateSubmissionRequest.SampleTypeEnum;
+import java.util.List;
 
 @Entity
-@Table(name="plate_submission")
-public class VendorPlateSubmissionEntity extends BrAPIPrimaryEntity{
-	
-	@Column
-	private String clientId;
-	@Column
-	private Integer numberOfSamples;
-	@Column
-	private SampleTypeEnum sampleType;
-	@OneToMany(mappedBy="submission", cascade = CascadeType.ALL)
+@Table(name = "plate_submission")
+public class VendorPlateSubmissionEntity extends BrAPIPrimaryEntity {
+
+    @Column
+    private String clientId;
+    @Column
+    private Integer numberOfSamples;
+    @Column
+    private SampleTypeEnum sampleType;
+    @OneToMany(mappedBy = "submission", cascade = CascadeType.ALL)
     private List<PlateEntity> plates;
-	@OneToOne(cascade = CascadeType.ALL)
-	private VendorOrderEntity order;
-	
-	
-	public VendorOrderEntity getOrder() {
-		return order;
-	}
-	public void setOrder(VendorOrderEntity order) {
-		this.order = order;
-	}
-	public String getClientId() {
-		return clientId;
-	}
-	public void setClientId(String clientId) {
-		this.clientId = clientId;
-	}
-	public Integer getNumberOfSamples() {
-		return numberOfSamples;
-	}
-	public void setNumberOfSamples(Integer numberOfSamples) {
-		this.numberOfSamples = numberOfSamples;
-	}
-	public SampleTypeEnum getSampleType() {
-		return sampleType;
-	}
-	public void setSampleType(SampleTypeEnum sampleType) {
-		this.sampleType = sampleType;
-	}
-	public List<PlateEntity> getPlates() {
-		return plates;
-	}
-	public void setPlates(List<PlateEntity> plates) {
-		this.plates = plates;
-	}
-	
+    @OneToOne(cascade = CascadeType.ALL)
+    private VendorOrderEntity order;
+
+
+    public VendorOrderEntity getOrder() {
+        return order;
+    }
+
+    public void setOrder(VendorOrderEntity order) {
+        this.order = order;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public Integer getNumberOfSamples() {
+        return numberOfSamples;
+    }
+
+    public void setNumberOfSamples(Integer numberOfSamples) {
+        this.numberOfSamples = numberOfSamples;
+    }
+
+    public SampleTypeEnum getSampleType() {
+        return sampleType;
+    }
+
+    public void setSampleType(SampleTypeEnum sampleType) {
+        this.sampleType = sampleType;
+    }
+
+    public List<PlateEntity> getPlates() {
+        return plates;
+    }
+
+    public void setPlates(List<PlateEntity> plates) {
+        this.plates = plates;
+    }
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecDeliverableEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecDeliverableEntity.java
index 575953e4..1f12e384 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecDeliverableEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecDeliverableEntity.java
@@ -1,44 +1,51 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
-@Table(name="vendor_spec_deliverable")
+@Table(name = "vendor_spec_deliverable")
 public class VendorSpecDeliverableEntity extends BrAPIBaseEntity {
-	@Column
-	private String vendorSpecPlatformDbId;
-	@Column
+    @Column
+    private String vendorSpecPlatformDbId;
+    @Column
     private String name;
-	@Column
+    @Column
     private String description;
-	@Column
+    @Column
     private String format;
-	public String getVendorSpecPlatformDbId() {
-		return vendorSpecPlatformDbId;
-	}
-	public void setVendorSpecPlatformDbId(String vendorSpecPlatformDbId) {
-		this.vendorSpecPlatformDbId = vendorSpecPlatformDbId;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	public String getFormat() {
-		return format;
-	}
-	public void setFormat(String format) {
-		this.format = format;
-	}
+
+    public String getVendorSpecPlatformDbId() {
+        return vendorSpecPlatformDbId;
+    }
+
+    public void setVendorSpecPlatformDbId(String vendorSpecPlatformDbId) {
+        this.vendorSpecPlatformDbId = vendorSpecPlatformDbId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    public void setFormat(String format) {
+        this.format = format;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecEntity.java
index 995fec1e..902d9787 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecEntity.java
@@ -1,97 +1,115 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
+import java.util.List;
+
 @Entity
-@Table(name="vendor_spec")
+@Table(name = "vendor_spec")
 public class VendorSpecEntity extends BrAPIPrimaryEntity {
-	@Column
-	private String vendorName;
-	@Column
-	private String vendorDescription;
-	@Column
-	private String vendorURL;
-	@Column
-	private String contactName;
-	@Column
-	private String vendorEmail;
-	@Column
-	private String vendorPhone;
-	@Column
-	private String vendorAddress;
-	@Column
-	private String vendorCity;
-	@Column
-	private String vendorCountry;
-	@OneToMany(mappedBy="vendorSpecDbId")
-	private List<VendorSpecPlatformEntity> platforms;
-	public String getVendorName() {
-		return vendorName;
-	}
-	public void setVendorName(String vendorName) {
-		this.vendorName = vendorName;
-	}
-	public String getVendorDescription() {
-		return vendorDescription;
-	}
-	public void setVendorDescription(String vendorDescription) {
-		this.vendorDescription = vendorDescription;
-	}
-	public String getVendorURL() {
-		return vendorURL;
-	}
-	public void setVendorURL(String vendorURL) {
-		this.vendorURL = vendorURL;
-	}
-	public String getContactName() {
-		return contactName;
-	}
-	public void setContactName(String contactName) {
-		this.contactName = contactName;
-	}
-	public String getVendorEmail() {
-		return vendorEmail;
-	}
-	public void setVendorEmail(String vendorEmail) {
-		this.vendorEmail = vendorEmail;
-	}
-	public String getVendorPhone() {
-		return vendorPhone;
-	}
-	public void setVendorPhone(String vendorPhone) {
-		this.vendorPhone = vendorPhone;
-	}
-	public String getVendorAddress() {
-		return vendorAddress;
-	}
-	public void setVendorAddress(String vendorAddress) {
-		this.vendorAddress = vendorAddress;
-	}
-	public String getVendorCity() {
-		return vendorCity;
-	}
-	public void setVendorCity(String vendorCity) {
-		this.vendorCity = vendorCity;
-	}
-	public String getVendorCountry() {
-		return vendorCountry;
-	}
-	public void setVendorCountry(String vendorCountry) {
-		this.vendorCountry = vendorCountry;
-	}
-	public List<VendorSpecPlatformEntity> getPlatforms() {
-		return platforms;
-	}
-	public void setPlatforms(List<VendorSpecPlatformEntity> platforms) {
-		this.platforms = platforms;
-	}
+    @Column
+    private String vendorName;
+    @Column
+    private String vendorDescription;
+    @Column
+    private String vendorURL;
+    @Column
+    private String contactName;
+    @Column
+    private String vendorEmail;
+    @Column
+    private String vendorPhone;
+    @Column
+    private String vendorAddress;
+    @Column
+    private String vendorCity;
+    @Column
+    private String vendorCountry;
+    @OneToMany(mappedBy = "vendorSpecDbId")
+    private List<VendorSpecPlatformEntity> platforms;
+
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public void setVendorName(String vendorName) {
+        this.vendorName = vendorName;
+    }
+
+    public String getVendorDescription() {
+        return vendorDescription;
+    }
+
+    public void setVendorDescription(String vendorDescription) {
+        this.vendorDescription = vendorDescription;
+    }
+
+    public String getVendorURL() {
+        return vendorURL;
+    }
+
+    public void setVendorURL(String vendorURL) {
+        this.vendorURL = vendorURL;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getVendorEmail() {
+        return vendorEmail;
+    }
+
+    public void setVendorEmail(String vendorEmail) {
+        this.vendorEmail = vendorEmail;
+    }
+
+    public String getVendorPhone() {
+        return vendorPhone;
+    }
+
+    public void setVendorPhone(String vendorPhone) {
+        this.vendorPhone = vendorPhone;
+    }
+
+    public String getVendorAddress() {
+        return vendorAddress;
+    }
+
+    public void setVendorAddress(String vendorAddress) {
+        this.vendorAddress = vendorAddress;
+    }
+
+    public String getVendorCity() {
+        return vendorCity;
+    }
+
+    public void setVendorCity(String vendorCity) {
+        this.vendorCity = vendorCity;
+    }
+
+    public String getVendorCountry() {
+        return vendorCountry;
+    }
+
+    public void setVendorCountry(String vendorCountry) {
+        this.vendorCountry = vendorCountry;
+    }
+
+    public List<VendorSpecPlatformEntity> getPlatforms() {
+        return platforms;
+    }
+
+    public void setPlatforms(List<VendorSpecPlatformEntity> platforms) {
+        this.platforms = platforms;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecInputFormatEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecInputFormatEntity.java
index e190e439..c36be8f2 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecInputFormatEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecInputFormatEntity.java
@@ -1,28 +1,31 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
-@Table(name="vendor_spec_input_format")
+@Table(name = "vendor_spec_input_format")
 public class VendorSpecInputFormatEntity extends BrAPIBaseEntity {
-	@Column
-	private String vendorSpecStandardRequirementDbId;
-	@Column
-	private String inputFormat;
-	public String getVendorSpecStandardRequirementDbId() {
-		return vendorSpecStandardRequirementDbId;
-	}
-	public void setVendorSpecStandardRequirementDbId(String vendorSpecStandardRequirementDbId) {
-		this.vendorSpecStandardRequirementDbId = vendorSpecStandardRequirementDbId;
-	}
-	public String getInputFormat() {
-		return inputFormat;
-	}
-	public void setInputFormat(String inputFormat) {
-		this.inputFormat = inputFormat;
-	}
+    @Column
+    private String vendorSpecStandardRequirementDbId;
+    @Column
+    private String inputFormat;
+
+    public String getVendorSpecStandardRequirementDbId() {
+        return vendorSpecStandardRequirementDbId;
+    }
+
+    public void setVendorSpecStandardRequirementDbId(String vendorSpecStandardRequirementDbId) {
+        this.vendorSpecStandardRequirementDbId = vendorSpecStandardRequirementDbId;
+    }
+
+    public String getInputFormat() {
+        return inputFormat;
+    }
+
+    public void setInputFormat(String inputFormat) {
+        this.inputFormat = inputFormat;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecPlatformEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecPlatformEntity.java
index b0f705e2..4fae6848 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecPlatformEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecPlatformEntity.java
@@ -1,145 +1,172 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
+import java.util.List;
+
 @Entity
-@Table(name="vendor_spec_platform")
-public class VendorSpecPlatformEntity extends BrAPIBaseEntity{
-	@Column
-	private String vendorSpecDbId;
-	@Column
+@Table(name = "vendor_spec_platform")
+public class VendorSpecPlatformEntity extends BrAPIBaseEntity {
+    @Column
+    private String vendorSpecDbId;
+    @Column
     private String platformName;
-	@Column
+    @Column
     private String platformDescription;
-	@Column
+    @Column
     private String platformURL;
-	@Column
+    @Column
     private String contactName;
-	@Column
+    @Column
     private String contactEmail;
-	@Column
+    @Column
     private String contactPhone;
-	@Column
+    @Column
     private String shippingAddress;
-	@OneToMany(mappedBy="vendorSpecPlatformDbId")
+    @OneToMany(mappedBy = "vendorSpecPlatformDbId")
     private List<VendorSpecDeliverableEntity> deliverables;
-	@OneToOne
+    @OneToOne
     private VendorSpecStandardRequirementEntity standardRequirements;
-	@Column
+    @Column
     private String specificRequirements;
-	@OneToMany(mappedBy="vendorSpecPlatformDbId")
+    @OneToMany(mappedBy = "vendorSpecPlatformDbId")
     private List<VendorSpecStatusEntity> statuses;
-	@Column
-	private String taxonomyIdSystemName;
-	@Column
-	private String taxonomyIdSystemURI;
-	@Column
-	private String tissueIdSystemName;
-	@Column
-	private String tissueIdSystemURI;
-	public String getVendorSpecDbId() {
-		return vendorSpecDbId;
-	}
-	public void setVendorSpecDbId(String vendorSpecDbId) {
-		this.vendorSpecDbId = vendorSpecDbId;
-	}
-	public String getPlatformName() {
-		return platformName;
-	}
-	public void setPlatformName(String platformName) {
-		this.platformName = platformName;
-	}
-	public String getPlatformDescription() {
-		return platformDescription;
-	}
-	public void setPlatformDescription(String platformDescription) {
-		this.platformDescription = platformDescription;
-	}
-	public String getPlatformURL() {
-		return platformURL;
-	}
-	public void setPlatformURL(String platformURL) {
-		this.platformURL = platformURL;
-	}
-	public String getContactName() {
-		return contactName;
-	}
-	public void setContactName(String contactName) {
-		this.contactName = contactName;
-	}
-	public String getContactEmail() {
-		return contactEmail;
-	}
-	public void setContactEmail(String contactEmail) {
-		this.contactEmail = contactEmail;
-	}
-	public String getContactPhone() {
-		return contactPhone;
-	}
-	public void setContactPhone(String contactPhone) {
-		this.contactPhone = contactPhone;
-	}
-	public String getShippingAddress() {
-		return shippingAddress;
-	}
-	public void setShippingAddress(String shippingAddress) {
-		this.shippingAddress = shippingAddress;
-	}
-	public List<VendorSpecDeliverableEntity> getDeliverables() {
-		return deliverables;
-	}
-	public void setDeliverables(List<VendorSpecDeliverableEntity> deliverables) {
-		this.deliverables = deliverables;
-	}
-	public VendorSpecStandardRequirementEntity getStandardRequirements() {
-		return standardRequirements;
-	}
-	public void setStandardRequirements(VendorSpecStandardRequirementEntity standardRequirements) {
-		this.standardRequirements = standardRequirements;
-	}
-	public String getSpecificRequirements() {
-		return specificRequirements;
-	}
-	public void setSpecificRequirements(String specificRequirements) {
-		this.specificRequirements = specificRequirements;
-	}
-	public List<VendorSpecStatusEntity> getStatuses() {
-		return statuses;
-	}
-	public void setStatuses(List<VendorSpecStatusEntity> statuses) {
-		this.statuses = statuses;
-	}
-	public String getTaxonomyIdSystemName() {
-		return taxonomyIdSystemName;
-	}
-	public void setTaxonomyIdSystemName(String taxonomyIdSystemName) {
-		this.taxonomyIdSystemName = taxonomyIdSystemName;
-	}
-	public String getTaxonomyIdSystemURI() {
-		return taxonomyIdSystemURI;
-	}
-	public void setTaxonomyIdSystemURI(String taxonomyIdSystemURI) {
-		this.taxonomyIdSystemURI = taxonomyIdSystemURI;
-	}
-	public String getTissueIdSystemName() {
-		return tissueIdSystemName;
-	}
-	public void setTissueIdSystemName(String tissueIdSystemName) {
-		this.tissueIdSystemName = tissueIdSystemName;
-	}
-	public String getTissueIdSystemURI() {
-		return tissueIdSystemURI;
-	}
-	public void setTissueIdSystemURI(String tissueIdSystemURI) {
-		this.tissueIdSystemURI = tissueIdSystemURI;
-	}
-	
+    @Column
+    private String taxonomyIdSystemName;
+    @Column
+    private String taxonomyIdSystemURI;
+    @Column
+    private String tissueIdSystemName;
+    @Column
+    private String tissueIdSystemURI;
+
+    public String getVendorSpecDbId() {
+        return vendorSpecDbId;
+    }
+
+    public void setVendorSpecDbId(String vendorSpecDbId) {
+        this.vendorSpecDbId = vendorSpecDbId;
+    }
+
+    public String getPlatformName() {
+        return platformName;
+    }
+
+    public void setPlatformName(String platformName) {
+        this.platformName = platformName;
+    }
+
+    public String getPlatformDescription() {
+        return platformDescription;
+    }
+
+    public void setPlatformDescription(String platformDescription) {
+        this.platformDescription = platformDescription;
+    }
+
+    public String getPlatformURL() {
+        return platformURL;
+    }
+
+    public void setPlatformURL(String platformURL) {
+        this.platformURL = platformURL;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactEmail() {
+        return contactEmail;
+    }
+
+    public void setContactEmail(String contactEmail) {
+        this.contactEmail = contactEmail;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+    public String getShippingAddress() {
+        return shippingAddress;
+    }
+
+    public void setShippingAddress(String shippingAddress) {
+        this.shippingAddress = shippingAddress;
+    }
+
+    public List<VendorSpecDeliverableEntity> getDeliverables() {
+        return deliverables;
+    }
+
+    public void setDeliverables(List<VendorSpecDeliverableEntity> deliverables) {
+        this.deliverables = deliverables;
+    }
+
+    public VendorSpecStandardRequirementEntity getStandardRequirements() {
+        return standardRequirements;
+    }
+
+    public void setStandardRequirements(VendorSpecStandardRequirementEntity standardRequirements) {
+        this.standardRequirements = standardRequirements;
+    }
+
+    public String getSpecificRequirements() {
+        return specificRequirements;
+    }
+
+    public void setSpecificRequirements(String specificRequirements) {
+        this.specificRequirements = specificRequirements;
+    }
+
+    public List<VendorSpecStatusEntity> getStatuses() {
+        return statuses;
+    }
+
+    public void setStatuses(List<VendorSpecStatusEntity> statuses) {
+        this.statuses = statuses;
+    }
+
+    public String getTaxonomyIdSystemName() {
+        return taxonomyIdSystemName;
+    }
+
+    public void setTaxonomyIdSystemName(String taxonomyIdSystemName) {
+        this.taxonomyIdSystemName = taxonomyIdSystemName;
+    }
+
+    public String getTaxonomyIdSystemURI() {
+        return taxonomyIdSystemURI;
+    }
+
+    public void setTaxonomyIdSystemURI(String taxonomyIdSystemURI) {
+        this.taxonomyIdSystemURI = taxonomyIdSystemURI;
+    }
+
+    public String getTissueIdSystemName() {
+        return tissueIdSystemName;
+    }
+
+    public void setTissueIdSystemName(String tissueIdSystemName) {
+        this.tissueIdSystemName = tissueIdSystemName;
+    }
+
+    public String getTissueIdSystemURI() {
+        return tissueIdSystemURI;
+    }
+
+    public void setTissueIdSystemURI(String tissueIdSystemURI) {
+        this.tissueIdSystemURI = tissueIdSystemURI;
+    }
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecSampleTypeEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecSampleTypeEntity.java
index 0b1e30d1..4b19e373 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecSampleTypeEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecSampleTypeEntity.java
@@ -1,28 +1,31 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
-@Table(name="vendor_spec_sample_type")
+@Table(name = "vendor_spec_sample_type")
 public class VendorSpecSampleTypeEntity extends BrAPIBaseEntity {
-	@Column
-	private String vendorSpecStandardRequirementDbId;
-	@Column
-	private String sampleType;
-	public String getVendorSpecStandardRequirementDbId() {
-		return vendorSpecStandardRequirementDbId;
-	}
-	public void setVendorSpecStandardRequirementDbId(String vendorSpecStandardRequirementDbId) {
-		this.vendorSpecStandardRequirementDbId = vendorSpecStandardRequirementDbId;
-	}
-	public String getSampleType() {
-		return sampleType;
-	}
-	public void setSampleType(String sampleType) {
-		this.sampleType = sampleType;
-	}
+    @Column
+    private String vendorSpecStandardRequirementDbId;
+    @Column
+    private String sampleType;
+
+    public String getVendorSpecStandardRequirementDbId() {
+        return vendorSpecStandardRequirementDbId;
+    }
+
+    public void setVendorSpecStandardRequirementDbId(String vendorSpecStandardRequirementDbId) {
+        this.vendorSpecStandardRequirementDbId = vendorSpecStandardRequirementDbId;
+    }
+
+    public String getSampleType() {
+        return sampleType;
+    }
+
+    public void setSampleType(String sampleType) {
+        this.sampleType = sampleType;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecStandardRequirementEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecStandardRequirementEntity.java
index 760213e6..19fd1280 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecStandardRequirementEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecStandardRequirementEntity.java
@@ -1,104 +1,124 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
+import java.util.List;
+
 @Entity
-@Table(name="vendor_spec_requirement")
+@Table(name = "vendor_spec_requirement")
 public class VendorSpecStandardRequirementEntity extends BrAPIBaseEntity {
-	@Column
+    @Column
     private String minConcentration;
-	@Column
+    @Column
     private String maxConcentration;
-	@Column
+    @Column
     private String minVolume;
-	@Column
+    @Column
     private String maxVolume;
-	@Column
+    @Column
     private String minSampleNumber;
-	@OneToMany(mappedBy="vendorSpecStandardRequirementDbId")
+    @OneToMany(mappedBy = "vendorSpecStandardRequirementDbId")
     private List<VendorSpecSampleTypeEntity> sampleTypes;
-	@Column
+    @Column
     private String sampleTypeDetails;
-	@OneToMany(mappedBy="vendorSpecStandardRequirementDbId")
+    @OneToMany(mappedBy = "vendorSpecStandardRequirementDbId")
     private List<VendorSpecInputFormatEntity> inputFormats;
-	@Column
+    @Column
     private String inputFormatDetails;
-	@Column
+    @Column
     private String plateOrientation;
-	@OneToMany(mappedBy="vendorSpecStandardRequirementDbId")
+    @OneToMany(mappedBy = "vendorSpecStandardRequirementDbId")
     private List<VendorSpecWellPositionEntity> blankWellPositions;
-	
-	public String getMinConcentration() {
-		return minConcentration;
-	}
-	public void setMinConcentration(String minConcentration) {
-		this.minConcentration = minConcentration;
-	}
-	public String getMaxConcentration() {
-		return maxConcentration;
-	}
-	public void setMaxConcentration(String maxConcentration) {
-		this.maxConcentration = maxConcentration;
-	}
-	public String getMinVolume() {
-		return minVolume;
-	}
-	public void setMinVolume(String minVolume) {
-		this.minVolume = minVolume;
-	}
-	public String getMaxVolume() {
-		return maxVolume;
-	}
-	public void setMaxVolume(String maxVolume) {
-		this.maxVolume = maxVolume;
-	}
-	public String getMinSampleNumber() {
-		return minSampleNumber;
-	}
-	public void setMinSampleNumber(String minSampleNumber) {
-		this.minSampleNumber = minSampleNumber;
-	}
-	public List<VendorSpecSampleTypeEntity> getSampleTypes() {
-		return sampleTypes;
-	}
-	public void setSampleTypes(List<VendorSpecSampleTypeEntity> sampleTypes) {
-		this.sampleTypes = sampleTypes;
-	}
-	public String getSampleTypeDetails() {
-		return sampleTypeDetails;
-	}
-	public void setSampleTypeDetails(String sampleTypeDetails) {
-		this.sampleTypeDetails = sampleTypeDetails;
-	}
-	public List<VendorSpecInputFormatEntity> getInputFormats() {
-		return inputFormats;
-	}
-	public void setInputFormats(List<VendorSpecInputFormatEntity> inputFormats) {
-		this.inputFormats = inputFormats;
-	}
-	public String getInputFormatDetails() {
-		return inputFormatDetails;
-	}
-	public void setInputFormatDetails(String inputFormatDetails) {
-		this.inputFormatDetails = inputFormatDetails;
-	}
-	public String getPlateOrientation() {
-		return plateOrientation;
-	}
-	public void setPlateOrientation(String plateOrientation) {
-		this.plateOrientation = plateOrientation;
-	}
-	public List<VendorSpecWellPositionEntity> getBlankWellPositions() {
-		return blankWellPositions;
-	}
-	public void setBlankWellPositions(List<VendorSpecWellPositionEntity> blankWellPositions) {
-		this.blankWellPositions = blankWellPositions;
-	}
+
+    public String getMinConcentration() {
+        return minConcentration;
+    }
+
+    public void setMinConcentration(String minConcentration) {
+        this.minConcentration = minConcentration;
+    }
+
+    public String getMaxConcentration() {
+        return maxConcentration;
+    }
+
+    public void setMaxConcentration(String maxConcentration) {
+        this.maxConcentration = maxConcentration;
+    }
+
+    public String getMinVolume() {
+        return minVolume;
+    }
+
+    public void setMinVolume(String minVolume) {
+        this.minVolume = minVolume;
+    }
+
+    public String getMaxVolume() {
+        return maxVolume;
+    }
+
+    public void setMaxVolume(String maxVolume) {
+        this.maxVolume = maxVolume;
+    }
+
+    public String getMinSampleNumber() {
+        return minSampleNumber;
+    }
+
+    public void setMinSampleNumber(String minSampleNumber) {
+        this.minSampleNumber = minSampleNumber;
+    }
+
+    public List<VendorSpecSampleTypeEntity> getSampleTypes() {
+        return sampleTypes;
+    }
+
+    public void setSampleTypes(List<VendorSpecSampleTypeEntity> sampleTypes) {
+        this.sampleTypes = sampleTypes;
+    }
+
+    public String getSampleTypeDetails() {
+        return sampleTypeDetails;
+    }
+
+    public void setSampleTypeDetails(String sampleTypeDetails) {
+        this.sampleTypeDetails = sampleTypeDetails;
+    }
+
+    public List<VendorSpecInputFormatEntity> getInputFormats() {
+        return inputFormats;
+    }
+
+    public void setInputFormats(List<VendorSpecInputFormatEntity> inputFormats) {
+        this.inputFormats = inputFormats;
+    }
+
+    public String getInputFormatDetails() {
+        return inputFormatDetails;
+    }
+
+    public void setInputFormatDetails(String inputFormatDetails) {
+        this.inputFormatDetails = inputFormatDetails;
+    }
+
+    public String getPlateOrientation() {
+        return plateOrientation;
+    }
+
+    public void setPlateOrientation(String plateOrientation) {
+        this.plateOrientation = plateOrientation;
+    }
+
+    public List<VendorSpecWellPositionEntity> getBlankWellPositions() {
+        return blankWellPositions;
+    }
+
+    public void setBlankWellPositions(List<VendorSpecWellPositionEntity> blankWellPositions) {
+        this.blankWellPositions = blankWellPositions;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecStatusEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecStatusEntity.java
index f02f3ef2..24950322 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecStatusEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecStatusEntity.java
@@ -1,36 +1,41 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
-@Table(name="vendor_spec_status")
+@Table(name = "vendor_spec_status")
 public class VendorSpecStatusEntity extends BrAPIBaseEntity {
-	@Column
-	private String vendorSpecPlatformDbId;
-	@Column
+    @Column
+    private String vendorSpecPlatformDbId;
+    @Column
     private String statusName;
-	@Column
+    @Column
     private String statusDescription;
-	public String getVendorSpecPlatformDbId() {
-		return vendorSpecPlatformDbId;
-	}
-	public void setVendorSpecPlatformDbId(String vendorSpecPlatformDbId) {
-		this.vendorSpecPlatformDbId = vendorSpecPlatformDbId;
-	}
-	public String getStatusName() {
-		return statusName;
-	}
-	public void setStatusName(String statusName) {
-		this.statusName = statusName;
-	}
-	public String getStatusDescription() {
-		return statusDescription;
-	}
-	public void setStatusDescription(String statusDescription) {
-		this.statusDescription = statusDescription;
-	}
+
+    public String getVendorSpecPlatformDbId() {
+        return vendorSpecPlatformDbId;
+    }
+
+    public void setVendorSpecPlatformDbId(String vendorSpecPlatformDbId) {
+        this.vendorSpecPlatformDbId = vendorSpecPlatformDbId;
+    }
+
+    public String getStatusName() {
+        return statusName;
+    }
+
+    public void setStatusName(String statusName) {
+        this.statusName = statusName;
+    }
+
+    public String getStatusDescription() {
+        return statusDescription;
+    }
+
+    public void setStatusDescription(String statusDescription) {
+        this.statusDescription = statusDescription;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecWellPositionEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecWellPositionEntity.java
index 80f8325f..07186b4d 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecWellPositionEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorSpecWellPositionEntity.java
@@ -1,28 +1,31 @@
 package org.brapi.test.BrAPITestServer.model.entity.geno.vendor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
-@Table(name="vendor_spec_well_position")
+@Table(name = "vendor_spec_well_position")
 public class VendorSpecWellPositionEntity extends BrAPIBaseEntity {
-	@Column
-	private String vendorSpecStandardRequirementDbId;
-	@Column
-	private String position;
-	public String getVendorSpecStandardRequirementDbId() {
-		return vendorSpecStandardRequirementDbId;
-	}
-	public void setVendorSpecStandardRequirementDbId(String vendorSpecStandardRequirementDbId) {
-		this.vendorSpecStandardRequirementDbId = vendorSpecStandardRequirementDbId;
-	}
-	public String getPosition() {
-		return position;
-	}
-	public void setPosition(String position) {
-		this.position = position;
-	}
+    @Column
+    private String vendorSpecStandardRequirementDbId;
+    @Column
+    private String position;
+
+    public String getVendorSpecStandardRequirementDbId() {
+        return vendorSpecStandardRequirementDbId;
+    }
+
+    public void setVendorSpecStandardRequirementDbId(String vendorSpecStandardRequirementDbId) {
+        this.vendorSpecStandardRequirementDbId = vendorSpecStandardRequirementDbId;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/BreedingMethodEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/BreedingMethodEntity.java
index af5254ed..fcb7aa8c 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/BreedingMethodEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/BreedingMethodEntity.java
@@ -1,39 +1,42 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
 @Entity
-@Table(name="breeding_method")
+@Table(name = "breeding_method")
 public class BreedingMethodEntity extends BrAPIPrimaryEntity {
-	@Column
+    @Column
     private String abbreviation;
     @Column
     private String name;
     @Column
     private String description;
-    
-	public String getAbbreviation() {
-		return abbreviation;
-	}
-	public void setAbbreviation(String abbreviation) {
-		this.abbreviation = abbreviation;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-        
+
+    public String getAbbreviation() {
+        return abbreviation;
+    }
+
+    public void setAbbreviation(String abbreviation) {
+        this.abbreviation = abbreviation;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossEntity.java
index 1e0164d7..b24c00b2 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossEntity.java
@@ -1,27 +1,17 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
-
 import io.swagger.model.germ.CrossType;
 import io.swagger.model.germ.PlannedCrossNewRequest.PlannedCrossStatusEnum;
+import jakarta.persistence.*;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Entity
-@Table(name="cross_entity")
+@Table(name = "cross_entity")
 public class CrossEntity extends BrAPIPrimaryEntity {
-	@Column
+    @Column
     private CrossType crossType;
     @ManyToOne
     private CrossingProjectEntity crossingProject;
@@ -40,64 +30,82 @@ public class CrossEntity extends BrAPIPrimaryEntity {
     @Column
     private Boolean planned;
 
-    
-	public PlannedCrossStatusEnum getStatus() {
-		return status;
-	}
-	public void setStatus(PlannedCrossStatusEnum status) {
-		this.status = status;
-	}
-	public CrossEntity getPlannedCross() {
-		return plannedCross;
-	}
-	public void setPlannedCross(CrossEntity plannedCross) {
-		this.plannedCross = plannedCross;
-	}
-	public List<CrossPollinationEventEntity> getPollinationEvents() {
-		return pollinationEvents;
-	}
-	public void setPollinationEvents(List<CrossPollinationEventEntity> pollinationEvents) {
-		this.pollinationEvents = pollinationEvents;
-	}
-	public List<String> getCrossAttributes() {
-		return crossAttributes;
-	}
-	public void setCrossAttributes(List<String> crossAttributes) {
-		this.crossAttributes = crossAttributes;
-	}
-	public Boolean getPlanned() {
-		return planned;
-	}
-	public void setPlanned(Boolean planned) {
-		this.planned = planned;
-	}
-	public CrossType getCrossType() {
-		return crossType;
-	}
-	public void setCrossType(CrossType crossType) {
-		this.crossType = crossType;
-	}
-	public CrossingProjectEntity getCrossingProject() {
-		return crossingProject;
-	}
-	public void setCrossingProject(CrossingProjectEntity crossingProject) {
-		this.crossingProject = crossingProject;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public List<CrossParentEntity> getParents() {
-		return parents;
-	}
-	public void setParents(List<CrossParentEntity> parents) {
-		this.parents = parents;
-	}
-	public void addParentItem(CrossParentEntity parent) {
-		if (getParents() == null)
-			setParents(new ArrayList<>());
-		getParents().add(parent);
-	}
+
+    public PlannedCrossStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(PlannedCrossStatusEnum status) {
+        this.status = status;
+    }
+
+    public CrossEntity getPlannedCross() {
+        return plannedCross;
+    }
+
+    public void setPlannedCross(CrossEntity plannedCross) {
+        this.plannedCross = plannedCross;
+    }
+
+    public List<CrossPollinationEventEntity> getPollinationEvents() {
+        return pollinationEvents;
+    }
+
+    public void setPollinationEvents(List<CrossPollinationEventEntity> pollinationEvents) {
+        this.pollinationEvents = pollinationEvents;
+    }
+
+    public List<String> getCrossAttributes() {
+        return crossAttributes;
+    }
+
+    public void setCrossAttributes(List<String> crossAttributes) {
+        this.crossAttributes = crossAttributes;
+    }
+
+    public Boolean getPlanned() {
+        return planned;
+    }
+
+    public void setPlanned(Boolean planned) {
+        this.planned = planned;
+    }
+
+    public CrossType getCrossType() {
+        return crossType;
+    }
+
+    public void setCrossType(CrossType crossType) {
+        this.crossType = crossType;
+    }
+
+    public CrossingProjectEntity getCrossingProject() {
+        return crossingProject;
+    }
+
+    public void setCrossingProject(CrossingProjectEntity crossingProject) {
+        this.crossingProject = crossingProject;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<CrossParentEntity> getParents() {
+        return parents;
+    }
+
+    public void setParents(List<CrossParentEntity> parents) {
+        this.parents = parents;
+    }
+
+    public void addParentItem(CrossParentEntity parent) {
+        if (getParents() == null)
+            setParents(new ArrayList<>());
+        getParents().add(parent);
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossParentEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossParentEntity.java
index f99eac73..b0b93256 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossParentEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossParentEntity.java
@@ -1,57 +1,64 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import io.swagger.model.germ.ParentType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
 
-import io.swagger.model.germ.ParentType;
-
 @Entity
-@Table(name="cross_parent")
+@Table(name = "cross_parent")
 public class CrossParentEntity extends BrAPIBaseEntity {
-	@ManyToOne
-	private GermplasmEntity germplasm;
-	@ManyToOne
-	private ObservationUnitEntity observationUnit;
-	@Column
-	private ParentType parentType;
-	@ManyToOne
-	private CrossEntity cross;
-	@ManyToOne
-	private CrossingProjectEntity crossingProject;
-	
-	public CrossingProjectEntity getCrossingProject() {
-		return crossingProject;
-	}
-	public void setCrossingProject(CrossingProjectEntity crossingProject) {
-		this.crossingProject = crossingProject;
-	}
-	public CrossEntity getCross() {
-		return cross;
-	}
-	public void setCross(CrossEntity cross) {
-		this.cross = cross;
-	}
-	public GermplasmEntity getGermplasm() {
-		return germplasm;
-	}
-	public void setGermplasm(GermplasmEntity germplasm) {
-		this.germplasm = germplasm;
-	}
-	public ObservationUnitEntity getObservationUnit() {
-		return observationUnit;
-	}
-	public void setObservationUnit(ObservationUnitEntity observationUnit) {
-		this.observationUnit = observationUnit;
-	}
-	public ParentType getParentType() {
-		return parentType;
-	}
-	public void setParentType(ParentType parentType) {
-		this.parentType = parentType;
-	} 
+    @ManyToOne
+    private GermplasmEntity germplasm;
+    @ManyToOne
+    private ObservationUnitEntity observationUnit;
+    @Column
+    private ParentType parentType;
+    @ManyToOne
+    private CrossEntity cross;
+    @ManyToOne
+    private CrossingProjectEntity crossingProject;
+
+    public CrossingProjectEntity getCrossingProject() {
+        return crossingProject;
+    }
+
+    public void setCrossingProject(CrossingProjectEntity crossingProject) {
+        this.crossingProject = crossingProject;
+    }
+
+    public CrossEntity getCross() {
+        return cross;
+    }
+
+    public void setCross(CrossEntity cross) {
+        this.cross = cross;
+    }
+
+    public GermplasmEntity getGermplasm() {
+        return germplasm;
+    }
+
+    public void setGermplasm(GermplasmEntity germplasm) {
+        this.germplasm = germplasm;
+    }
+
+    public ObservationUnitEntity getObservationUnit() {
+        return observationUnit;
+    }
+
+    public void setObservationUnit(ObservationUnitEntity observationUnit) {
+        this.observationUnit = observationUnit;
+    }
+
+    public ParentType getParentType() {
+        return parentType;
+    }
+
+    public void setParentType(ParentType parentType) {
+        this.parentType = parentType;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossPollinationEventEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossPollinationEventEntity.java
index ea73c241..7ac85db5 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossPollinationEventEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossPollinationEventEntity.java
@@ -1,56 +1,55 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
+import java.util.Date;
+
 @Entity
-@Table(name="cross_pollination_event")
+@Table(name = "cross_pollination_event")
 public class CrossPollinationEventEntity extends BrAPIBaseEntity {
-	@Column
-	private String pollinationNumber = null;
-	@Column
-	private Boolean pollinationSuccessful = null;
-	@Column
-	private Date pollinationTimeStamp = null;
-	@ManyToOne
-	private CrossEntity cross;
-
-	public CrossEntity getCross() {
-		return cross;
-	}
-
-	public void setCross(CrossEntity cross) {
-		this.cross = cross;
-	}
-
-	public String getPollinationNumber() {
-		return pollinationNumber;
-	}
-
-	public void setPollinationNumber(String pollinationNumber) {
-		this.pollinationNumber = pollinationNumber;
-	}
-
-	public Boolean getPollinationSuccessful() {
-		return pollinationSuccessful;
-	}
-
-	public void setPollinationSuccessful(Boolean pollinationSuccessful) {
-		this.pollinationSuccessful = pollinationSuccessful;
-	}
-
-	public Date getPollinationTimeStamp() {
-		return pollinationTimeStamp;
-	}
-
-	public void setPollinationTimeStamp(Date pollinationTimeStamp) {
-		this.pollinationTimeStamp = pollinationTimeStamp;
-	}
-	
+    @Column
+    private String pollinationNumber = null;
+    @Column
+    private Boolean pollinationSuccessful = null;
+    @Column
+    private Date pollinationTimeStamp = null;
+    @ManyToOne
+    private CrossEntity cross;
+
+    public CrossEntity getCross() {
+        return cross;
+    }
+
+    public void setCross(CrossEntity cross) {
+        this.cross = cross;
+    }
+
+    public String getPollinationNumber() {
+        return pollinationNumber;
+    }
+
+    public void setPollinationNumber(String pollinationNumber) {
+        this.pollinationNumber = pollinationNumber;
+    }
+
+    public Boolean getPollinationSuccessful() {
+        return pollinationSuccessful;
+    }
+
+    public void setPollinationSuccessful(Boolean pollinationSuccessful) {
+        this.pollinationSuccessful = pollinationSuccessful;
+    }
+
+    public Date getPollinationTimeStamp() {
+        return pollinationTimeStamp;
+    }
+
+    public void setPollinationTimeStamp(Date pollinationTimeStamp) {
+        this.pollinationTimeStamp = pollinationTimeStamp;
+    }
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossingProjectEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossingProjectEntity.java
index 293af7e2..12a11e0e 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossingProjectEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/CrossingProjectEntity.java
@@ -1,58 +1,53 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.ProgramEntity;
 
+import java.util.List;
+
 @Entity
 @Table(name = "crossing_project")
 public class CrossingProjectEntity extends BrAPIPrimaryEntity {
-	@Column
-	private String name;
-	@Column
-	private String description;
-	@ManyToOne
-	private ProgramEntity program;
-	@OneToMany(mappedBy = "crossingProject")
-	private List<CrossParentEntity> potentialParents;
-
-	public List<CrossParentEntity> getPotentialParents() {
-		return potentialParents;
-	}
-
-	public void setPotentialParents(List<CrossParentEntity> potentialParents) {
-		this.potentialParents = potentialParents;
-	}
-
-	public ProgramEntity getProgram() {
-		return program;
-	}
-
-	public void setProgram(ProgramEntity program) {
-		this.program = program;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
+    @Column
+    private String name;
+    @Column
+    private String description;
+    @ManyToOne
+    private ProgramEntity program;
+    @OneToMany(mappedBy = "crossingProject")
+    private List<CrossParentEntity> potentialParents;
+
+    public List<CrossParentEntity> getPotentialParents() {
+        return potentialParents;
+    }
+
+    public void setPotentialParents(List<CrossParentEntity> potentialParents) {
+        this.potentialParents = potentialParents;
+    }
+
+    public ProgramEntity getProgram() {
+        return program;
+    }
+
+    public void setProgram(ProgramEntity program) {
+        this.program = program;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/DonorEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/DonorEntity.java
index 4a4972c6..e9c8535d 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/DonorEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/DonorEntity.java
@@ -1,56 +1,63 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
 @Entity
-@Table(name="germplasm_donor")
-public class DonorEntity extends BrAPIPrimaryEntity{
-	@ManyToOne
-	private GermplasmEntity germplasm;
-	@Column
-	private String donorAccessionNumber;
-	@Column
-	private String donorInstituteCode;
-	@Column
-	private String donorInstituteName;
-	@Column
-	private String germplasmPUI;
-	
-	public String getDonorInstituteName() {
-		return donorInstituteName;
-	}
-	public void setDonorInstituteName(String donorInstituteName) {
-		this.donorInstituteName = donorInstituteName;
-	}
-	public String getDonorAccessionNumber() {
-		return donorAccessionNumber;
-	}
-	public void setDonorAccessionNumber(String donorAccessionNumber) {
-		this.donorAccessionNumber = donorAccessionNumber;
-	}
-	public String getDonorInstituteCode() {
-		return donorInstituteCode;
-	}
-	public void setDonorInstituteCode(String donorInstituteCode) {
-		this.donorInstituteCode = donorInstituteCode;
-	}
-	public String getGermplasmPUI() {
-		return germplasmPUI;
-	}
-	public void setGermplasmPUI(String germplasmPUI) {
-		this.germplasmPUI = germplasmPUI;
-	}
-	public GermplasmEntity getGermplasm() {
-		return germplasm;
-	}
-	public void setGermplasm(GermplasmEntity germplasm) {
-		this.germplasm = germplasm;
-	}
-	
+@Table(name = "germplasm_donor")
+public class DonorEntity extends BrAPIPrimaryEntity {
+    @ManyToOne
+    private GermplasmEntity germplasm;
+    @Column
+    private String donorAccessionNumber;
+    @Column
+    private String donorInstituteCode;
+    @Column
+    private String donorInstituteName;
+    @Column
+    private String germplasmPUI;
+
+    public String getDonorInstituteName() {
+        return donorInstituteName;
+    }
+
+    public void setDonorInstituteName(String donorInstituteName) {
+        this.donorInstituteName = donorInstituteName;
+    }
+
+    public String getDonorAccessionNumber() {
+        return donorAccessionNumber;
+    }
+
+    public void setDonorAccessionNumber(String donorAccessionNumber) {
+        this.donorAccessionNumber = donorAccessionNumber;
+    }
+
+    public String getDonorInstituteCode() {
+        return donorInstituteCode;
+    }
+
+    public void setDonorInstituteCode(String donorInstituteCode) {
+        this.donorInstituteCode = donorInstituteCode;
+    }
+
+    public String getGermplasmPUI() {
+        return germplasmPUI;
+    }
+
+    public void setGermplasmPUI(String germplasmPUI) {
+        this.germplasmPUI = germplasmPUI;
+    }
+
+    public GermplasmEntity getGermplasm() {
+        return germplasm;
+    }
+
+    public void setGermplasm(GermplasmEntity germplasm) {
+        this.germplasm = germplasm;
+    }
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmAttributeDefinitionEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmAttributeDefinitionEntity.java
index b20bdb8c..c69d9c06 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmAttributeDefinitionEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmAttributeDefinitionEntity.java
@@ -1,97 +1,96 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.VariableBaseEntity;
 
+import java.util.List;
+
 @Entity
 @Table(name = "germplasm_attribute_definition")
 public class GermplasmAttributeDefinitionEntity extends VariableBaseEntity {
-	@Column
-	private String attributeCategory;
-	@Column
-	private String code;
-	@Column
-	private String uri;
-	@Column
-	private String name;
-	@Column
-	private String pui;
-	@Column
-	private String description;
-	@Column
-	private String datatype;
-	@OneToMany(mappedBy = "attribute")
-	private List<GermplasmAttributeValueEntity> values;
-
-	
-	public String getPUI() {
-		return pui;
-	}
-
-	public void setPUI(String pui) {
-		this.pui = pui;
-	}
-
-	public String getAttributeCategory() {
-		return attributeCategory;
-	}
-
-	public void setAttributeCategory(String attributeCategory) {
-		this.attributeCategory = attributeCategory;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getUri() {
-		return uri;
-	}
-
-	public void setUri(String uri) {
-		this.uri = uri;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getDatatype() {
-		return datatype;
-	}
-
-	public void setDatatype(String datatype) {
-		this.datatype = datatype;
-	}
-
-	public List<GermplasmAttributeValueEntity> getValues() {
-		return values;
-	}
-
-	public void setValues(List<GermplasmAttributeValueEntity> values) {
-		this.values = values;
-	}
+    @Column
+    private String attributeCategory;
+    @Column
+    private String code;
+    @Column
+    private String uri;
+    @Column
+    private String name;
+    @Column
+    private String pui;
+    @Column
+    private String description;
+    @Column
+    private String datatype;
+    @OneToMany(mappedBy = "attribute")
+    private List<GermplasmAttributeValueEntity> values;
+
+
+    public String getPUI() {
+        return pui;
+    }
+
+    public void setPUI(String pui) {
+        this.pui = pui;
+    }
+
+    public String getAttributeCategory() {
+        return attributeCategory;
+    }
+
+    public void setAttributeCategory(String attributeCategory) {
+        this.attributeCategory = attributeCategory;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getDatatype() {
+        return datatype;
+    }
+
+    public void setDatatype(String datatype) {
+        this.datatype = datatype;
+    }
+
+    public List<GermplasmAttributeValueEntity> getValues() {
+        return values;
+    }
+
+    public void setValues(List<GermplasmAttributeValueEntity> values) {
+        this.values = values;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmAttributeValueEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmAttributeValueEntity.java
index fa1265b1..c5ecbd3e 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmAttributeValueEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmAttributeValueEntity.java
@@ -1,51 +1,57 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+@Entity
+@Table(name = "germplasm_attribute_value")
+public class GermplasmAttributeValueEntity extends BrAPIPrimaryEntity {
+    @ManyToOne
+    private GermplasmAttributeDefinitionEntity attribute;
+    @ManyToOne
+    private GermplasmEntity germplasm;
+    @Column
+    private String value;
+    @Column
+    private Date determinedDate;
+
 
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+    public GermplasmAttributeDefinitionEntity getAttribute() {
+        return attribute;
+    }
 
-@Entity
-@Table(name="germplasm_attribute_value")
-public class GermplasmAttributeValueEntity extends BrAPIPrimaryEntity{
-	@ManyToOne
-	private GermplasmAttributeDefinitionEntity attribute;
-	@ManyToOne
-	private GermplasmEntity germplasm;
-	@Column
-	private String value;
-	@Column
-	private Date determinedDate;
-	
-	
-	public GermplasmAttributeDefinitionEntity getAttribute() {
-		return attribute;
-	}
-	public void setAttribute(GermplasmAttributeDefinitionEntity attribute) {
-		this.attribute = attribute;
-	}
-	public GermplasmEntity getGermplasm() {
-		return germplasm;
-	}
-	public void setGermplasm(GermplasmEntity germplasm) {
-		this.germplasm = germplasm;
-	}
-	public String getValue() {
-		return value;
-	}
-	public void setValue(String value) {
-		this.value = value;
-	}
-	public Date getDeterminedDate() {
-		return determinedDate;
-	}
-	public void setDeterminedDate(Date determinedDate) {
-		this.determinedDate = determinedDate;
-	}
+    public void setAttribute(GermplasmAttributeDefinitionEntity attribute) {
+        this.attribute = attribute;
+    }
+
+    public GermplasmEntity getGermplasm() {
+        return germplasm;
+    }
+
+    public void setGermplasm(GermplasmEntity germplasm) {
+        this.germplasm = germplasm;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Date getDeterminedDate() {
+        return determinedDate;
+    }
+
+    public void setDeterminedDate(Date determinedDate) {
+        this.determinedDate = determinedDate;
+    }
 
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmEntity.java
index 4578306d..accd6226 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmEntity.java
@@ -1,20 +1,10 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import io.swagger.model.germ.BiologicalStatusOfAccessionCode;
+import io.swagger.model.germ.GermplasmMCPD.AcquisitionSourceCodeEnum;
+import io.swagger.model.germ.GermplasmMCPD.MlsStatusEnum;
+import io.swagger.model.germ.GermplasmStorageTypesEnum;
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.SearchRequestEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.CropEntity;
@@ -22,343 +12,342 @@
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.TaxonEntity;
 
-import io.swagger.model.germ.BiologicalStatusOfAccessionCode;
-import io.swagger.model.germ.GermplasmMCPD.AcquisitionSourceCodeEnum;
-import io.swagger.model.germ.GermplasmMCPD.MlsStatusEnum;
-import io.swagger.model.germ.GermplasmStorageTypesEnum;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Entity
 @Table(name = "germplasm")
 public class GermplasmEntity extends BrAPIPrimaryEntity {
-	@Column
-	private String accessionNumber;
-	@Column
-	private Date acquisitionDate;
-	@Column
-	private AcquisitionSourceCodeEnum acquisitionSourceCode;
-	@OneToMany(mappedBy = "germplasm")
-	private List<GermplasmAttributeValueEntity> attributes;
-	@Column
-	private BiologicalStatusOfAccessionCode biologicalStatusOfAccessionCode;
-	@ManyToOne(cascade = CascadeType.DETACH)
-	private BreedingMethodEntity breedingMethod;
-	@Column
-	private String collection;
-	@Column
-	private String countryOfOriginCode;
-	@ManyToOne(cascade = CascadeType.DETACH)
-	private CropEntity crop;
-	@Column
-	private String defaultDisplayName;
-	@Column
-	private String documentationURL;
-	@OneToMany(mappedBy = "germplasm", cascade = CascadeType.ALL)
-	private List<DonorEntity> donors;
-	@Column
-	private String genus;
-	@Column
-	private String germplasmName;
-	@OneToMany(mappedBy = "germplasm", cascade = CascadeType.ALL)
-	private List<GermplasmOriginEntity> germplasmOrigin;
-	@Column
-	private String germplasmPreprocessing;
-	@Column
-	private String germplasmPUI;
-	@OneToMany(mappedBy = "germplasm", cascade = CascadeType.ALL)
-	private List<GermplasmInstituteEntity> institutes;
-	@Column
-	private MlsStatusEnum mlsStatus;
-	@OneToOne(cascade = CascadeType.ALL, mappedBy = "germplasm")
-	private PedigreeNodeEntity pedigree;
-	@ManyToMany
-	@JoinTable
-	private List<SearchRequestEntity> searchResults;
-	@Column
-	private String seedSource;
-	@Column
-	private String seedSourceDescription;
-	@Column
-	private String species;
-	@Column
-	private String speciesAuthority;
-	@Column
-	private String subtaxa;
-	@Column
-	private String subtaxaAuthority;
-	@OneToMany(mappedBy = "germplasm", cascade = CascadeType.ALL)
-	private List<GermplasmSynonymEntity> synonyms;
-	@OneToMany(mappedBy = "germplasm", cascade = CascadeType.ALL)
-	private List<TaxonEntity> taxonIds;
-	@OneToMany(mappedBy = "germplasm")
-	private List<ObservationUnitEntity> observationUnits;
-	@ElementCollection
-	private List<GermplasmStorageTypesEnum> typeOfGermplasmStorageCode;
-
-	public GermplasmInstituteEntity getHostInstitute() {
-		if (getInstitutes() != null) {
-			for (GermplasmInstituteEntity institute : getInstitutes()) {
-				if (InstituteTypeEnum.HOST.equals(institute.getInstituteType())) {
-					return institute;
-				}
-			}
-		}
-		return null;
-	}
-
-	public void setHostInstitute(String code, String name) {
-		if (getInstitutes() == null)
-			setInstitutes(new ArrayList<>());
-		if (getHostInstitute() == null) {
-			GermplasmInstituteEntity entity = new GermplasmInstituteEntity();
-			entity.setGermplasm(this);
-			entity.setInstituteCode(code);
-			entity.setInstituteName(name);
-			entity.setInstituteType(InstituteTypeEnum.HOST);
-			getInstitutes().add(entity);
-		} else {
-			getHostInstitute().setInstituteCode(code);
-			getHostInstitute().setInstituteName(name);
-		}
-	}
-
-	public MlsStatusEnum getMlsStatus() {
-		return mlsStatus;
-	}
-
-	public void setMlsStatus(MlsStatusEnum mlsStatus) {
-		this.mlsStatus = mlsStatus;
-	}
-
-	public AcquisitionSourceCodeEnum getAcquisitionSourceCode() {
-		return acquisitionSourceCode;
-	}
-
-	public void setAcquisitionSourceCode(AcquisitionSourceCodeEnum acquisitionSourceCode) {
-		this.acquisitionSourceCode = acquisitionSourceCode;
-	}
-
-	public List<GermplasmInstituteEntity> getInstitutes() {
-		return institutes;
-	}
-
-	public void setInstitutes(List<GermplasmInstituteEntity> institutes) {
-		this.institutes = institutes;
-	}
-
-	public String getGermplasmPreprocessing() {
-		return germplasmPreprocessing;
-	}
-
-	public void setGermplasmPreprocessing(String germplasmPreprocessing) {
-		this.germplasmPreprocessing = germplasmPreprocessing;
-	}
-
-	public List<GermplasmOriginEntity> getGermplasmOrigin() {
-		return germplasmOrigin;
-	}
-
-	public void setGermplasmOrigin(List<GermplasmOriginEntity> germplasmOrigin) {
-		this.germplasmOrigin = germplasmOrigin;
-	}
-
-	public String getCollection() {
-		return collection;
-	}
-
-	public void setCollection(String collection) {
-		this.collection = collection;
-	}
-
-	public String getAccessionNumber() {
-		return accessionNumber;
-	}
-
-	public Date getAcquisitionDate() {
-		return acquisitionDate;
-	}
-
-	public List<GermplasmAttributeValueEntity> getAttributes() {
-		return attributes;
-	}
-
-	public BiologicalStatusOfAccessionCode getBiologicalStatusOfAccessionCode() {
-		return biologicalStatusOfAccessionCode;
-	}
-
-	public BreedingMethodEntity getBreedingMethod() {
-		return breedingMethod;
-	}
-
-	public String getCountryOfOriginCode() {
-		return countryOfOriginCode;
-	}
-
-	public CropEntity getCrop() {
-		return crop;
-	}
-
-	public String getDefaultDisplayName() {
-		return defaultDisplayName;
-	}
-
-	public String getDocumentationURL() {
-		return documentationURL;
-	}
-
-	public List<DonorEntity> getDonors() {
-		return donors;
-	}
-
-	public String getGenus() {
-		return genus;
-	}
-
-	public String getGermplasmName() {
-		return germplasmName;
-	}
+    @Column
+    private String accessionNumber;
+    @Column
+    private Date acquisitionDate;
+    @Column
+    private AcquisitionSourceCodeEnum acquisitionSourceCode;
+    @OneToMany(mappedBy = "germplasm")
+    private List<GermplasmAttributeValueEntity> attributes;
+    @Column
+    private BiologicalStatusOfAccessionCode biologicalStatusOfAccessionCode;
+    @ManyToOne(cascade = CascadeType.DETACH)
+    private BreedingMethodEntity breedingMethod;
+    @Column
+    private String collection;
+    @Column
+    private String countryOfOriginCode;
+    @ManyToOne(cascade = CascadeType.DETACH)
+    private CropEntity crop;
+    @Column
+    private String defaultDisplayName;
+    @Column
+    private String documentationURL;
+    @OneToMany(mappedBy = "germplasm", cascade = CascadeType.ALL)
+    private List<DonorEntity> donors;
+    @Column
+    private String genus;
+    @Column
+    private String germplasmName;
+    @OneToMany(mappedBy = "germplasm", cascade = CascadeType.ALL)
+    private List<GermplasmOriginEntity> germplasmOrigin;
+    @Column
+    private String germplasmPreprocessing;
+    @Column
+    private String germplasmPUI;
+    @OneToMany(mappedBy = "germplasm", cascade = CascadeType.ALL)
+    private List<GermplasmInstituteEntity> institutes;
+    @Column
+    private MlsStatusEnum mlsStatus;
+    @OneToOne(cascade = CascadeType.ALL, mappedBy = "germplasm")
+    private PedigreeNodeEntity pedigree;
+    @ManyToMany
+    @JoinTable
+    private List<SearchRequestEntity> searchResults;
+    @Column
+    private String seedSource;
+    @Column
+    private String seedSourceDescription;
+    @Column
+    private String species;
+    @Column
+    private String speciesAuthority;
+    @Column
+    private String subtaxa;
+    @Column
+    private String subtaxaAuthority;
+    @OneToMany(mappedBy = "germplasm", cascade = CascadeType.ALL)
+    private List<GermplasmSynonymEntity> synonyms;
+    @OneToMany(mappedBy = "germplasm", cascade = CascadeType.ALL)
+    private List<TaxonEntity> taxonIds;
+    @OneToMany(mappedBy = "germplasm")
+    private List<ObservationUnitEntity> observationUnits;
+    @ElementCollection
+    private List<GermplasmStorageTypesEnum> typeOfGermplasmStorageCode;
+
+    public GermplasmInstituteEntity getHostInstitute() {
+        if (getInstitutes() != null) {
+            for (GermplasmInstituteEntity institute : getInstitutes()) {
+                if (InstituteTypeEnum.HOST.equals(institute.getInstituteType())) {
+                    return institute;
+                }
+            }
+        }
+        return null;
+    }
+
+    public void setHostInstitute(String code, String name) {
+        if (getInstitutes() == null)
+            setInstitutes(new ArrayList<>());
+        if (getHostInstitute() == null) {
+            GermplasmInstituteEntity entity = new GermplasmInstituteEntity();
+            entity.setGermplasm(this);
+            entity.setInstituteCode(code);
+            entity.setInstituteName(name);
+            entity.setInstituteType(InstituteTypeEnum.HOST);
+            getInstitutes().add(entity);
+        } else {
+            getHostInstitute().setInstituteCode(code);
+            getHostInstitute().setInstituteName(name);
+        }
+    }
+
+    public MlsStatusEnum getMlsStatus() {
+        return mlsStatus;
+    }
+
+    public void setMlsStatus(MlsStatusEnum mlsStatus) {
+        this.mlsStatus = mlsStatus;
+    }
+
+    public AcquisitionSourceCodeEnum getAcquisitionSourceCode() {
+        return acquisitionSourceCode;
+    }
+
+    public void setAcquisitionSourceCode(AcquisitionSourceCodeEnum acquisitionSourceCode) {
+        this.acquisitionSourceCode = acquisitionSourceCode;
+    }
+
+    public List<GermplasmInstituteEntity> getInstitutes() {
+        return institutes;
+    }
+
+    public void setInstitutes(List<GermplasmInstituteEntity> institutes) {
+        this.institutes = institutes;
+    }
+
+    public String getGermplasmPreprocessing() {
+        return germplasmPreprocessing;
+    }
+
+    public void setGermplasmPreprocessing(String germplasmPreprocessing) {
+        this.germplasmPreprocessing = germplasmPreprocessing;
+    }
+
+    public List<GermplasmOriginEntity> getGermplasmOrigin() {
+        return germplasmOrigin;
+    }
+
+    public void setGermplasmOrigin(List<GermplasmOriginEntity> germplasmOrigin) {
+        this.germplasmOrigin = germplasmOrigin;
+    }
+
+    public String getCollection() {
+        return collection;
+    }
+
+    public void setCollection(String collection) {
+        this.collection = collection;
+    }
+
+    public String getAccessionNumber() {
+        return accessionNumber;
+    }
+
+    public Date getAcquisitionDate() {
+        return acquisitionDate;
+    }
+
+    public List<GermplasmAttributeValueEntity> getAttributes() {
+        return attributes;
+    }
+
+    public BiologicalStatusOfAccessionCode getBiologicalStatusOfAccessionCode() {
+        return biologicalStatusOfAccessionCode;
+    }
+
+    public BreedingMethodEntity getBreedingMethod() {
+        return breedingMethod;
+    }
+
+    public String getCountryOfOriginCode() {
+        return countryOfOriginCode;
+    }
+
+    public CropEntity getCrop() {
+        return crop;
+    }
+
+    public String getDefaultDisplayName() {
+        return defaultDisplayName;
+    }
+
+    public String getDocumentationURL() {
+        return documentationURL;
+    }
+
+    public List<DonorEntity> getDonors() {
+        return donors;
+    }
+
+    public String getGenus() {
+        return genus;
+    }
+
+    public String getGermplasmName() {
+        return germplasmName;
+    }
 
-	public String getGermplasmPUI() {
-		return germplasmPUI;
-	}
+    public String getGermplasmPUI() {
+        return germplasmPUI;
+    }
 
-	public PedigreeNodeEntity getPedigree() {
-		return pedigree;
-	}
+    public PedigreeNodeEntity getPedigree() {
+        return pedigree;
+    }
 
-	public List<SearchRequestEntity> getSearchResults() {
-		return searchResults;
-	}
+    public List<SearchRequestEntity> getSearchResults() {
+        return searchResults;
+    }
 
-	public String getSpecies() {
-		return species;
-	}
+    public String getSpecies() {
+        return species;
+    }
 
-	public String getSpeciesAuthority() {
-		return speciesAuthority;
-	}
+    public String getSpeciesAuthority() {
+        return speciesAuthority;
+    }
 
-	public String getSubtaxa() {
-		return subtaxa;
-	}
+    public String getSubtaxa() {
+        return subtaxa;
+    }
 
-	public String getSubtaxaAuthority() {
-		return subtaxaAuthority;
-	}
+    public String getSubtaxaAuthority() {
+        return subtaxaAuthority;
+    }
 
-	public List<GermplasmSynonymEntity> getSynonyms() {
-		return synonyms;
-	}
+    public List<GermplasmSynonymEntity> getSynonyms() {
+        return synonyms;
+    }
 
-	public List<TaxonEntity> getTaxonIds() {
-		return taxonIds;
-	}
+    public List<TaxonEntity> getTaxonIds() {
+        return taxonIds;
+    }
 
-	public List<GermplasmStorageTypesEnum> getTypeOfGermplasmStorageCode() {
-		return typeOfGermplasmStorageCode;
-	}
+    public List<GermplasmStorageTypesEnum> getTypeOfGermplasmStorageCode() {
+        return typeOfGermplasmStorageCode;
+    }
 
-	public void setAccessionNumber(String accessionNumber) {
-		this.accessionNumber = accessionNumber;
-	}
+    public void setAccessionNumber(String accessionNumber) {
+        this.accessionNumber = accessionNumber;
+    }
 
-	public void setAcquisitionDate(Date acquisitionDate) {
-		this.acquisitionDate = acquisitionDate;
-	}
+    public void setAcquisitionDate(Date acquisitionDate) {
+        this.acquisitionDate = acquisitionDate;
+    }
 
-	public void setAttributes(List<GermplasmAttributeValueEntity> attributes) {
-		this.attributes = attributes;
-	}
+    public void setAttributes(List<GermplasmAttributeValueEntity> attributes) {
+        this.attributes = attributes;
+    }
 
-	public void setBiologicalStatusOfAccessionCode(BiologicalStatusOfAccessionCode biologicalStatusOfAccessionCode) {
-		this.biologicalStatusOfAccessionCode = biologicalStatusOfAccessionCode;
-	}
+    public void setBiologicalStatusOfAccessionCode(BiologicalStatusOfAccessionCode biologicalStatusOfAccessionCode) {
+        this.biologicalStatusOfAccessionCode = biologicalStatusOfAccessionCode;
+    }
 
-	public void setBreedingMethod(BreedingMethodEntity breedingMethod) {
-		this.breedingMethod = breedingMethod;
-	}
+    public void setBreedingMethod(BreedingMethodEntity breedingMethod) {
+        this.breedingMethod = breedingMethod;
+    }
 
-	public void setCountryOfOriginCode(String countryOfOriginCode) {
-		this.countryOfOriginCode = countryOfOriginCode;
-	}
+    public void setCountryOfOriginCode(String countryOfOriginCode) {
+        this.countryOfOriginCode = countryOfOriginCode;
+    }
 
-	public void setCrop(CropEntity crop) {
-		this.crop = crop;
-	}
+    public void setCrop(CropEntity crop) {
+        this.crop = crop;
+    }
 
-	public void setDefaultDisplayName(String defaultDisplayName) {
-		this.defaultDisplayName = defaultDisplayName;
-	}
+    public void setDefaultDisplayName(String defaultDisplayName) {
+        this.defaultDisplayName = defaultDisplayName;
+    }
 
-	public void setDocumentationURL(String documentationURL) {
-		this.documentationURL = documentationURL;
-	}
+    public void setDocumentationURL(String documentationURL) {
+        this.documentationURL = documentationURL;
+    }
 
-	public void setDonors(List<DonorEntity> donors) {
-		this.donors = donors;
-	}
+    public void setDonors(List<DonorEntity> donors) {
+        this.donors = donors;
+    }
 
-	public void setGenus(String genus) {
-		this.genus = genus;
-	}
+    public void setGenus(String genus) {
+        this.genus = genus;
+    }
 
-	public void setGermplasmName(String germplasmName) {
-		this.germplasmName = germplasmName;
-	}
+    public void setGermplasmName(String germplasmName) {
+        this.germplasmName = germplasmName;
+    }
 
-	public void setGermplasmPUI(String germplasmPUI) {
-		this.germplasmPUI = germplasmPUI;
-	}
+    public void setGermplasmPUI(String germplasmPUI) {
+        this.germplasmPUI = germplasmPUI;
+    }
 
-	public String getSeedSource() {
-		return seedSource;
-	}
+    public String getSeedSource() {
+        return seedSource;
+    }
 
-	public void setSeedSource(String seedSource) {
-		this.seedSource = seedSource;
-	}
+    public void setSeedSource(String seedSource) {
+        this.seedSource = seedSource;
+    }
 
-	public String getSeedSourceDescription() {
-		return seedSourceDescription;
-	}
+    public String getSeedSourceDescription() {
+        return seedSourceDescription;
+    }
 
-	public void setSeedSourceDescription(String seedSourceDescription) {
-		this.seedSourceDescription = seedSourceDescription;
-	}
+    public void setSeedSourceDescription(String seedSourceDescription) {
+        this.seedSourceDescription = seedSourceDescription;
+    }
 
-	public void setPedigree(PedigreeNodeEntity pedigree) {
-		this.pedigree = pedigree;
-	}
+    public void setPedigree(PedigreeNodeEntity pedigree) {
+        this.pedigree = pedigree;
+    }
 
-	public void setSearchResults(List<SearchRequestEntity> searchResults) {
-		this.searchResults = searchResults;
-	}
+    public void setSearchResults(List<SearchRequestEntity> searchResults) {
+        this.searchResults = searchResults;
+    }
 
-	public void setSpecies(String species) {
-		this.species = species;
-	}
+    public void setSpecies(String species) {
+        this.species = species;
+    }
 
-	public void setSpeciesAuthority(String speciesAuthority) {
-		this.speciesAuthority = speciesAuthority;
-	}
+    public void setSpeciesAuthority(String speciesAuthority) {
+        this.speciesAuthority = speciesAuthority;
+    }
 
-	public void setSubtaxa(String subtaxa) {
-		this.subtaxa = subtaxa;
-	}
+    public void setSubtaxa(String subtaxa) {
+        this.subtaxa = subtaxa;
+    }
 
-	public void setSubtaxaAuthority(String subtaxaAuthority) {
-		this.subtaxaAuthority = subtaxaAuthority;
-	}
+    public void setSubtaxaAuthority(String subtaxaAuthority) {
+        this.subtaxaAuthority = subtaxaAuthority;
+    }
 
-	public void setSynonyms(List<GermplasmSynonymEntity> synonyms) {
-		this.synonyms = synonyms;
-	}
+    public void setSynonyms(List<GermplasmSynonymEntity> synonyms) {
+        this.synonyms = synonyms;
+    }
 
-	public void setTaxonIds(List<TaxonEntity> taxonIds) {
-		this.taxonIds = taxonIds;
-	}
+    public void setTaxonIds(List<TaxonEntity> taxonIds) {
+        this.taxonIds = taxonIds;
+    }
 
-	public void setTypeOfGermplasmStorageCode(List<GermplasmStorageTypesEnum> typeOfGermplasmStorageCode) {
-		this.typeOfGermplasmStorageCode = typeOfGermplasmStorageCode;
-	}
+    public void setTypeOfGermplasmStorageCode(List<GermplasmStorageTypesEnum> typeOfGermplasmStorageCode) {
+        this.typeOfGermplasmStorageCode = typeOfGermplasmStorageCode;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmInstituteEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmInstituteEntity.java
index 6126331f..a8621b94 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmInstituteEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmInstituteEntity.java
@@ -1,69 +1,68 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "germplasm_institute")
 public class GermplasmInstituteEntity extends BrAPIBaseEntity {
 
-	@Column
-	private String instituteCode;
-	@Column
-	private InstituteTypeEnum instituteType;
-	@Column
-	private String instituteName;
-	@Column
-	private String instituteAddress;
-	@ManyToOne
-	private GermplasmEntity germplasm;
-
-	public enum InstituteTypeEnum {
-		HOST, DONOR, BREEDING, COLLECTING, REDUNDANT
-	}
-
-	public String getInstituteCode() {
-		return instituteCode;
-	}
-
-	public void setInstituteCode(String instituteCode) {
-		this.instituteCode = instituteCode;
-	}
-
-	public InstituteTypeEnum getInstituteType() {
-		return instituteType;
-	}
-
-	public void setInstituteType(InstituteTypeEnum instituteType) {
-		this.instituteType = instituteType;
-	}
-
-	public String getInstituteName() {
-		return instituteName;
-	}
-
-	public void setInstituteName(String instituteName) {
-		this.instituteName = instituteName;
-	}
-
-	public String getInstituteAddress() {
-		return instituteAddress;
-	}
-
-	public void setInstituteAddress(String instituteAddress) {
-		this.instituteAddress = instituteAddress;
-	}
-
-	public GermplasmEntity getGermplasm() {
-		return germplasm;
-	}
-
-	public void setGermplasm(GermplasmEntity germplasm) {
-		this.germplasm = germplasm;
-	}
+    @Column
+    private String instituteCode;
+    @Column
+    private InstituteTypeEnum instituteType;
+    @Column
+    private String instituteName;
+    @Column
+    private String instituteAddress;
+    @ManyToOne
+    private GermplasmEntity germplasm;
+
+    public enum InstituteTypeEnum {
+        HOST, DONOR, BREEDING, COLLECTING, REDUNDANT
+    }
+
+    public String getInstituteCode() {
+        return instituteCode;
+    }
+
+    public void setInstituteCode(String instituteCode) {
+        this.instituteCode = instituteCode;
+    }
+
+    public InstituteTypeEnum getInstituteType() {
+        return instituteType;
+    }
+
+    public void setInstituteType(InstituteTypeEnum instituteType) {
+        this.instituteType = instituteType;
+    }
+
+    public String getInstituteName() {
+        return instituteName;
+    }
+
+    public void setInstituteName(String instituteName) {
+        this.instituteName = instituteName;
+    }
+
+    public String getInstituteAddress() {
+        return instituteAddress;
+    }
+
+    public void setInstituteAddress(String instituteAddress) {
+        this.instituteAddress = instituteAddress;
+    }
+
+    public GermplasmEntity getGermplasm() {
+        return germplasm;
+    }
+
+    public void setGermplasm(GermplasmEntity germplasm) {
+        this.germplasm = germplasm;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmOriginEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmOriginEntity.java
index 6fbd5889..9e23e526 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmOriginEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmOriginEntity.java
@@ -1,42 +1,41 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 import org.brapi.test.BrAPITestServer.model.entity.GeoJSONEntity;
 
 @Entity
-@Table(name="germplasm_origin")
-public class GermplasmOriginEntity extends BrAPIBaseEntity{
-	@Column
-	private String coordinateUncertainty;
-	@OneToOne(cascade = CascadeType.ALL)
-	private GeoJSONEntity coordinates;
-	@ManyToOne
-	private GermplasmEntity germplasm;
-	
-	public GermplasmEntity getGermplasm() {
-		return germplasm;
-	}
-	public void setGermplasm(GermplasmEntity germplasm) {
-		this.germplasm = germplasm;
-	}
-	public String getCoordinateUncertainty() {
-		return coordinateUncertainty;
-	}
-	public void setCoordinateUncertainty(String coordinateUncertainty) {
-		this.coordinateUncertainty = coordinateUncertainty;
-	}
-	public GeoJSONEntity getCoordinates() {
-		return coordinates;
-	}
-	public void setCoordinates(GeoJSONEntity coordinates) {
-		this.coordinates = coordinates;
-	}
+@Table(name = "germplasm_origin")
+public class GermplasmOriginEntity extends BrAPIBaseEntity {
+    @Column
+    private String coordinateUncertainty;
+    @OneToOne(cascade = CascadeType.ALL)
+    private GeoJSONEntity coordinates;
+    @ManyToOne
+    private GermplasmEntity germplasm;
+
+    public GermplasmEntity getGermplasm() {
+        return germplasm;
+    }
+
+    public void setGermplasm(GermplasmEntity germplasm) {
+        this.germplasm = germplasm;
+    }
+
+    public String getCoordinateUncertainty() {
+        return coordinateUncertainty;
+    }
+
+    public void setCoordinateUncertainty(String coordinateUncertainty) {
+        this.coordinateUncertainty = coordinateUncertainty;
+    }
+
+    public GeoJSONEntity getCoordinates() {
+        return coordinates;
+    }
+
+    public void setCoordinates(GeoJSONEntity coordinates) {
+        this.coordinates = coordinates;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmSynonymEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmSynonymEntity.java
index 725a7baf..9aa107d7 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmSynonymEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/GermplasmSynonymEntity.java
@@ -1,39 +1,43 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "germplasm_synonym")
 public class GermplasmSynonymEntity extends BrAPIBaseEntity {
-	@Column
-	private String synonym;
-	@Column
-	private String type;
-	@ManyToOne
-	private GermplasmEntity germplasm;
-	
-	public GermplasmEntity getGermplasm() {
-		return germplasm;
-	}
-	public void setGermplasm(GermplasmEntity germplasm) {
-		this.germplasm = germplasm;
-	}
-	public String getSynonym() {
-		return synonym;
-	}
-	public void setSynonym(String synonym) {
-		this.synonym = synonym;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
+    @Column
+    private String synonym;
+    @Column
+    private String type;
+    @ManyToOne
+    private GermplasmEntity germplasm;
+
+    public GermplasmEntity getGermplasm() {
+        return germplasm;
+    }
+
+    public void setGermplasm(GermplasmEntity germplasm) {
+        this.germplasm = germplasm;
+    }
+
+    public String getSynonym() {
+        return synonym;
+    }
+
+    public void setSynonym(String synonym) {
+        this.synonym = synonym;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/PedigreeEdgeEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/PedigreeEdgeEntity.java
index ba0ffa7e..4d40d7ea 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/PedigreeEdgeEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/PedigreeEdgeEntity.java
@@ -1,53 +1,58 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
-
 import io.swagger.model.germ.ParentType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
 @Entity
-@Table(name="pedigree_edge")
-public class PedigreeEdgeEntity extends BrAPIPrimaryEntity{
-	@ManyToOne
-	private PedigreeNodeEntity thisNode;
-	@ManyToOne
-	private PedigreeNodeEntity conncetedNode;
-	@Column
-	private ParentType parentType;
-	@Column
-	private EdgeType edgeType;
-	
-
-	public PedigreeNodeEntity getThisNode() {
-		return thisNode;
-	}
-	public void setThisNode(PedigreeNodeEntity thisNode) {
-		this.thisNode = thisNode;
-	}
-	public EdgeType getEdgeType() {
-		return edgeType;
-	}
-	public void setEdgeType(EdgeType edgeType) {
-		this.edgeType = edgeType;
-	}
-	public PedigreeNodeEntity getConncetedNode() {
-		return conncetedNode;
-	}
-	public void setConncetedNode(PedigreeNodeEntity conncetedNode) {
-		this.conncetedNode = conncetedNode;
-	}
-	public ParentType getParentType() {
-		return parentType;
-	}
-	public void setParentType(ParentType parentType) {
-		this.parentType = parentType;
-	}
-    
-	public enum EdgeType{
-		parent, child, sibling
-	}
+@Table(name = "pedigree_edge")
+public class PedigreeEdgeEntity extends BrAPIPrimaryEntity {
+    @ManyToOne
+    private PedigreeNodeEntity thisNode;
+    @ManyToOne
+    private PedigreeNodeEntity conncetedNode;
+    @Column
+    private ParentType parentType;
+    @Column
+    private EdgeType edgeType;
+
+
+    public PedigreeNodeEntity getThisNode() {
+        return thisNode;
+    }
+
+    public void setThisNode(PedigreeNodeEntity thisNode) {
+        this.thisNode = thisNode;
+    }
+
+    public EdgeType getEdgeType() {
+        return edgeType;
+    }
+
+    public void setEdgeType(EdgeType edgeType) {
+        this.edgeType = edgeType;
+    }
+
+    public PedigreeNodeEntity getConncetedNode() {
+        return conncetedNode;
+    }
+
+    public void setConncetedNode(PedigreeNodeEntity conncetedNode) {
+        this.conncetedNode = conncetedNode;
+    }
+
+    public ParentType getParentType() {
+        return parentType;
+    }
+
+    public void setParentType(ParentType parentType) {
+        this.parentType = parentType;
+    }
+
+    public enum EdgeType {
+        parent, child, sibling
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/PedigreeNodeEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/PedigreeNodeEntity.java
index 39aa1604..9784f95e 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/PedigreeNodeEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/PedigreeNodeEntity.java
@@ -1,139 +1,131 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
+import io.swagger.model.germ.ParentType;
+import jakarta.persistence.*;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+import org.brapi.test.BrAPITestServer.model.entity.germ.PedigreeEdgeEntity.EdgeType;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
-import org.brapi.test.BrAPITestServer.model.entity.germ.PedigreeEdgeEntity.EdgeType;
-
-import io.swagger.model.germ.ParentType;
-
 @Entity
 @Table(name = "pedigree_node")
 public class PedigreeNodeEntity extends BrAPIPrimaryEntity {
-	@ManyToOne
-	private CrossingProjectEntity crossingProject;
-	@Column
-	private Integer crossingYear;
-	@Column
-	private String familyCode;
-	@OneToOne(cascade = CascadeType.ALL)
-	private GermplasmEntity germplasm;
-	@Column
-	private String pedigreeString;
-	@OneToMany(mappedBy = "thisNode", cascade = CascadeType.ALL)
-	private List<PedigreeEdgeEntity> edges = new ArrayList<>();
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(germplasm);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		PedigreeNodeEntity other = (PedigreeNodeEntity) obj;
-		return Objects.equals(germplasm, other.germplasm);
-	}
-
-	public CrossingProjectEntity getCrossingProject() {
-		return crossingProject;
-	}
-
-	public void setCrossingProject(CrossingProjectEntity crossingProject) {
-		this.crossingProject = crossingProject;
-	}
-
-	public Integer getCrossingYear() {
-		return crossingYear;
-	}
-
-	public void setCrossingYear(Integer crossingYear) {
-		this.crossingYear = crossingYear;
-	}
-
-	public String getFamilyCode() {
-		return familyCode;
-	}
-
-	public void setFamilyCode(String familyCode) {
-		this.familyCode = familyCode;
-	}
-
-	public GermplasmEntity getGermplasm() {
-		return germplasm;
-	}
-
-	public void setGermplasm(GermplasmEntity germplasm) {
-		this.germplasm = germplasm;
-	}
-
-	public String getPedigreeString() {
-		return pedigreeString;
-	}
-
-	public void setPedigreeString(String pedigreeString) {
-		this.pedigreeString = pedigreeString;
-	}
-
-	public List<PedigreeEdgeEntity> getParentEdges() {
-		return edges.stream().filter(e -> {
-			return e.getEdgeType() == EdgeType.parent;
-		}).collect(Collectors.toList());
-	}
-
-	public List<PedigreeNodeEntity> getParentNodes() {
-		return edges.stream().filter(e -> {
-			return e.getEdgeType() == EdgeType.parent;
-		}).map(edge -> edge.getConncetedNode()).collect(Collectors.toList());
-	}
-
-	public List<PedigreeEdgeEntity> getProgenyEdges() {
-		return edges.stream().filter(e -> {
-			return e.getEdgeType() == EdgeType.child;
-		}).collect(Collectors.toList());
-	}
-
-	public List<PedigreeNodeEntity> getProgenyNodes() {
-		return edges.stream().filter(e -> {
-			return e.getEdgeType() == EdgeType.child;
-		}).map(edge -> edge.getConncetedNode()).collect(Collectors.toList());
-	}
-
-	public void addParent(PedigreeNodeEntity node, ParentType type) {
-		PedigreeEdgeEntity edge = new PedigreeEdgeEntity();
-		edge.setThisNode(this);
-		edge.setConncetedNode(node);
-		edge.setParentType(type);
-		edge.setEdgeType(EdgeType.parent);
-		if(edges == null) 
-			edges = new ArrayList<>();
-		edges.add(edge);
-	}
-
-	public void addProgeny(PedigreeNodeEntity node, ParentType type) {
-		PedigreeEdgeEntity edge = new PedigreeEdgeEntity();
-		edge.setThisNode(this);
-		edge.setConncetedNode(node);
-		edge.setParentType(type);
-		edge.setEdgeType(EdgeType.child);
-		if(edges == null) 
-			edges = new ArrayList<>();
-		edges.add(edge);
-	}
+    @ManyToOne
+    private CrossingProjectEntity crossingProject;
+    @Column
+    private Integer crossingYear;
+    @Column
+    private String familyCode;
+    @OneToOne(cascade = CascadeType.ALL)
+    private GermplasmEntity germplasm;
+    @Column
+    private String pedigreeString;
+    @OneToMany(mappedBy = "thisNode", cascade = CascadeType.ALL)
+    private List<PedigreeEdgeEntity> edges = new ArrayList<>();
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(germplasm);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        PedigreeNodeEntity other = (PedigreeNodeEntity) obj;
+        return Objects.equals(germplasm, other.germplasm);
+    }
+
+    public CrossingProjectEntity getCrossingProject() {
+        return crossingProject;
+    }
+
+    public void setCrossingProject(CrossingProjectEntity crossingProject) {
+        this.crossingProject = crossingProject;
+    }
+
+    public Integer getCrossingYear() {
+        return crossingYear;
+    }
+
+    public void setCrossingYear(Integer crossingYear) {
+        this.crossingYear = crossingYear;
+    }
+
+    public String getFamilyCode() {
+        return familyCode;
+    }
+
+    public void setFamilyCode(String familyCode) {
+        this.familyCode = familyCode;
+    }
+
+    public GermplasmEntity getGermplasm() {
+        return germplasm;
+    }
+
+    public void setGermplasm(GermplasmEntity germplasm) {
+        this.germplasm = germplasm;
+    }
+
+    public String getPedigreeString() {
+        return pedigreeString;
+    }
+
+    public void setPedigreeString(String pedigreeString) {
+        this.pedigreeString = pedigreeString;
+    }
+
+    public List<PedigreeEdgeEntity> getParentEdges() {
+        return edges.stream().filter(e -> {
+            return e.getEdgeType() == EdgeType.parent;
+        }).collect(Collectors.toList());
+    }
+
+    public List<PedigreeNodeEntity> getParentNodes() {
+        return edges.stream().filter(e -> {
+            return e.getEdgeType() == EdgeType.parent;
+        }).map(edge -> edge.getConncetedNode()).collect(Collectors.toList());
+    }
+
+    public List<PedigreeEdgeEntity> getProgenyEdges() {
+        return edges.stream().filter(e -> {
+            return e.getEdgeType() == EdgeType.child;
+        }).collect(Collectors.toList());
+    }
+
+    public List<PedigreeNodeEntity> getProgenyNodes() {
+        return edges.stream().filter(e -> {
+            return e.getEdgeType() == EdgeType.child;
+        }).map(edge -> edge.getConncetedNode()).collect(Collectors.toList());
+    }
+
+    public void addParent(PedigreeNodeEntity node, ParentType type) {
+        PedigreeEdgeEntity edge = new PedigreeEdgeEntity();
+        edge.setThisNode(this);
+        edge.setConncetedNode(node);
+        edge.setParentType(type);
+        edge.setEdgeType(EdgeType.parent);
+        if (edges == null)
+            edges = new ArrayList<>();
+        edges.add(edge);
+    }
+
+    public void addProgeny(PedigreeNodeEntity node, ParentType type) {
+        PedigreeEdgeEntity edge = new PedigreeEdgeEntity();
+        edge.setThisNode(this);
+        edge.setConncetedNode(node);
+        edge.setParentType(type);
+        edge.setEdgeType(EdgeType.child);
+        if (edges == null)
+            edges = new ArrayList<>();
+        edges.add(edge);
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotContentMixtureEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotContentMixtureEntity.java
index 380f81b9..f7e08b03 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotContentMixtureEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotContentMixtureEntity.java
@@ -1,47 +1,53 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "seed_lot_content_mixture")
 public class SeedLotContentMixtureEntity extends BrAPIBaseEntity {
-	@Column
-	private Integer mixturePercentage;
-	@ManyToOne
-	private GermplasmEntity germplasm;
-	@ManyToOne
-	private CrossEntity cross;
-	@ManyToOne
-	private SeedLotEntity seedLot;
-	
-	public Integer getMixturePercentage() {
-		return mixturePercentage;
-	}
-	public void setMixturePercentage(Integer mixturePercentage) {
-		this.mixturePercentage = mixturePercentage;
-	}
-	public GermplasmEntity getGermplasm() {
-		return germplasm;
-	}
-	public void setGermplasm(GermplasmEntity germplasm) {
-		this.germplasm = germplasm;
-	}
-	public CrossEntity getCross() {
-		return cross;
-	}
-	public void setCross(CrossEntity cross) {
-		this.cross = cross;
-	}
-	public SeedLotEntity getSeedLot() {
-		return seedLot;
-	}
-	public void setSeedLot(SeedLotEntity seedLot) {
-		this.seedLot = seedLot;
-	}
+    @Column
+    private Integer mixturePercentage;
+    @ManyToOne
+    private GermplasmEntity germplasm;
+    @ManyToOne
+    private CrossEntity cross;
+    @ManyToOne
+    private SeedLotEntity seedLot;
+
+    public Integer getMixturePercentage() {
+        return mixturePercentage;
+    }
+
+    public void setMixturePercentage(Integer mixturePercentage) {
+        this.mixturePercentage = mixturePercentage;
+    }
+
+    public GermplasmEntity getGermplasm() {
+        return germplasm;
+    }
+
+    public void setGermplasm(GermplasmEntity germplasm) {
+        this.germplasm = germplasm;
+    }
+
+    public CrossEntity getCross() {
+        return cross;
+    }
+
+    public void setCross(CrossEntity cross) {
+        this.cross = cross;
+    }
+
+    public SeedLotEntity getSeedLot() {
+        return seedLot;
+    }
+
+    public void setSeedLot(SeedLotEntity seedLot) {
+        this.seedLot = seedLot;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotEntity.java
index 09d66592..5c1e1bbb 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotEntity.java
@@ -1,110 +1,126 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.LocationEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.ProgramEntity;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
 @Entity
 @Table(name = "seed_lot")
 public class SeedLotEntity extends BrAPIPrimaryEntity {
-	@Column
-	private BigDecimal amount;
-	@Column
-	private Date createdDate;
-	@Column
-	private Date lastUpdated;
-	@ManyToOne 
-	private LocationEntity location;
-	@ManyToOne
-	private ProgramEntity program;
-	@Column
-	private String description;
-	@Column
-	private String name;
-	@Column
-	private String sourceCollection;
-	@Column
-	private String storageLocation;
-	@Column
-	private String units;
-	@OneToMany(mappedBy = "seedLot")
-	private List<SeedLotContentMixtureEntity> contentMixture;
-	
-	public List<SeedLotContentMixtureEntity> getContentMixture() {
-		return contentMixture;
-	}
-	public void setContentMixture(List<SeedLotContentMixtureEntity> contentMixture) {
-		this.contentMixture = contentMixture;
-	}
-	public BigDecimal getAmount() {
-		return amount;
-	}
-	public void setAmount(BigDecimal amount) {
-		this.amount = amount;
-	}
-	public Date getCreatedDate() {
-		return createdDate;
-	}
-	public void setCreatedDate(Date createdDate) {
-		this.createdDate = createdDate;
-	}
-	public Date getLastUpdated() {
-		return lastUpdated;
-	}
-	public void setLastUpdated(Date lastUpdated) {
-		this.lastUpdated = lastUpdated;
-	}
-	public LocationEntity getLocation() {
-		return location;
-	}
-	public void setLocation(LocationEntity location) {
-		this.location = location;
-	}
-	public ProgramEntity getProgram() {
-		return program;
-	}
-	public void setProgram(ProgramEntity program) {
-		this.program = program;
-	}
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getSourceCollection() {
-		return sourceCollection;
-	}
-	public void setSourceCollection(String sourceCollection) {
-		this.sourceCollection = sourceCollection;
-	}
-	public String getStorageLocation() {
-		return storageLocation;
-	}
-	public void setStorageLocation(String storageLocation) {
-		this.storageLocation = storageLocation;
-	}
-	public String getUnits() {
-		return units;
-	}
-	public void setUnits(String units) {
-		this.units = units;
-	}
+    @Column
+    private BigDecimal amount;
+    @Column
+    private Date createdDate;
+    @Column
+    private Date lastUpdated;
+    @ManyToOne
+    private LocationEntity location;
+    @ManyToOne
+    private ProgramEntity program;
+    @Column
+    private String description;
+    @Column
+    private String name;
+    @Column
+    private String sourceCollection;
+    @Column
+    private String storageLocation;
+    @Column
+    private String units;
+    @OneToMany(mappedBy = "seedLot")
+    private List<SeedLotContentMixtureEntity> contentMixture;
+
+    public List<SeedLotContentMixtureEntity> getContentMixture() {
+        return contentMixture;
+    }
+
+    public void setContentMixture(List<SeedLotContentMixtureEntity> contentMixture) {
+        this.contentMixture = contentMixture;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public Date getLastUpdated() {
+        return lastUpdated;
+    }
+
+    public void setLastUpdated(Date lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    public LocationEntity getLocation() {
+        return location;
+    }
+
+    public void setLocation(LocationEntity location) {
+        this.location = location;
+    }
+
+    public ProgramEntity getProgram() {
+        return program;
+    }
+
+    public void setProgram(ProgramEntity program) {
+        this.program = program;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSourceCollection() {
+        return sourceCollection;
+    }
+
+    public void setSourceCollection(String sourceCollection) {
+        this.sourceCollection = sourceCollection;
+    }
+
+    public String getStorageLocation() {
+        return storageLocation;
+    }
+
+    public void setStorageLocation(String storageLocation) {
+        this.storageLocation = storageLocation;
+    }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotTransactionEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotTransactionEntity.java
index 7707effe..0a41af16 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotTransactionEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/germ/SeedLotTransactionEntity.java
@@ -1,65 +1,75 @@
 package org.brapi.test.BrAPITestServer.model.entity.germ;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
-
 @Entity
 @Table(name = "seed_lot_transaction")
 public class SeedLotTransactionEntity extends BrAPIPrimaryEntity {
-	@Column
-	private BigDecimal amount;
-	@ManyToOne
-	private SeedLotEntity toSeedLot;
-	@ManyToOne
-	private SeedLotEntity fromSeedLot;
-	@Column
-	private String description;
-	@Column
-	private Date timestamp;
-	@Column
-	private String units;
-	
-	public BigDecimal getAmount() {
-		return amount;
-	}
-	public void setAmount(BigDecimal amount) {
-		this.amount = amount;
-	}
-	public SeedLotEntity getToSeedLot() {
-		return toSeedLot;
-	}
-	public void setToSeedLot(SeedLotEntity toSeedLot) {
-		this.toSeedLot = toSeedLot;
-	}
-	public SeedLotEntity getFromSeedLot() {
-		return fromSeedLot;
-	}
-	public void setFromSeedLot(SeedLotEntity fromSeedLot) {
-		this.fromSeedLot = fromSeedLot;
-	}
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	public Date getTimestamp() {
-		return timestamp;
-	}
-	public void setTimestamp(Date timestamp) {
-		this.timestamp = timestamp;
-	}
-	public String getUnits() {
-		return units;
-	}
-	public void setUnits(String units) {
-		this.units = units;
-	}
+    @Column
+    private BigDecimal amount;
+    @ManyToOne
+    private SeedLotEntity toSeedLot;
+    @ManyToOne
+    private SeedLotEntity fromSeedLot;
+    @Column
+    private String description;
+    @Column
+    private Date timestamp;
+    @Column
+    private String units;
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public SeedLotEntity getToSeedLot() {
+        return toSeedLot;
+    }
+
+    public void setToSeedLot(SeedLotEntity toSeedLot) {
+        this.toSeedLot = toSeedLot;
+    }
+
+    public SeedLotEntity getFromSeedLot() {
+        return fromSeedLot;
+    }
+
+    public void setFromSeedLot(SeedLotEntity fromSeedLot) {
+        this.fromSeedLot = fromSeedLot;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Date getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Date timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/EventEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/EventEntity.java
index adf28948..6bfc934d 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/EventEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/EventEntity.java
@@ -1,91 +1,85 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.Date;
-import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.StudyEntity;
 
+import java.util.Date;
+import java.util.List;
+
 @Entity
 @Table(name = "event")
 public class EventEntity extends BrAPIPrimaryEntity {
-	@ElementCollection
-	private List<Date> dates;
-	@Column
-	private String eventDescription;
-	@OneToMany(mappedBy="event")
-	private List<EventParameterEntity> eventParameters;
-	@Column
-	private String eventType = null;
-	@Column
-	private String eventTypeDbId = null;
-	@ManyToMany
-	@JoinTable
-	private List<ObservationUnitEntity> observationUnits;
-	@ManyToOne
-	private StudyEntity study;
-
-	public List<Date> getDates() {
-		return dates;
-	}
-
-	public void setDates(List<Date> dates) {
-		this.dates = dates;
-	}
-
-	public String getEventDescription() {
-		return eventDescription;
-	}
-
-	public void setEventDescription(String eventDescription) {
-		this.eventDescription = eventDescription;
-	}
-
-	public List<EventParameterEntity> getEventParameters() {
-		return eventParameters;
-	}
-
-	public void setEventParameters(List<EventParameterEntity> eventParameters) {
-		this.eventParameters = eventParameters;
-	}
-
-	public String getEventType() {
-		return eventType;
-	}
-
-	public void setEventType(String eventType) {
-		this.eventType = eventType;
-	}
-
-	public String getEventTypeDbId() {
-		return eventTypeDbId;
-	}
-
-	public void setEventTypeDbId(String eventTypeDbId) {
-		this.eventTypeDbId = eventTypeDbId;
-	}
-
-	public List<ObservationUnitEntity> getObservationUnits() {
-		return observationUnits;
-	}
-
-	public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
-		this.observationUnits = observationUnits;
-	}
-
-	public StudyEntity getStudy() {
-		return study;
-	}
-
-	public void setStudy(StudyEntity study) {
-		this.study = study;
-	}
+    @ElementCollection
+    private List<Date> dates;
+    @Column
+    private String eventDescription;
+    @OneToMany(mappedBy = "event")
+    private List<EventParameterEntity> eventParameters;
+    @Column
+    private String eventType = null;
+    @Column
+    private String eventTypeDbId = null;
+    @ManyToMany
+    @JoinTable
+    private List<ObservationUnitEntity> observationUnits;
+    @ManyToOne
+    private StudyEntity study;
+
+    public List<Date> getDates() {
+        return dates;
+    }
+
+    public void setDates(List<Date> dates) {
+        this.dates = dates;
+    }
+
+    public String getEventDescription() {
+        return eventDescription;
+    }
+
+    public void setEventDescription(String eventDescription) {
+        this.eventDescription = eventDescription;
+    }
+
+    public List<EventParameterEntity> getEventParameters() {
+        return eventParameters;
+    }
+
+    public void setEventParameters(List<EventParameterEntity> eventParameters) {
+        this.eventParameters = eventParameters;
+    }
+
+    public String getEventType() {
+        return eventType;
+    }
+
+    public void setEventType(String eventType) {
+        this.eventType = eventType;
+    }
+
+    public String getEventTypeDbId() {
+        return eventTypeDbId;
+    }
+
+    public void setEventTypeDbId(String eventTypeDbId) {
+        this.eventTypeDbId = eventTypeDbId;
+    }
+
+    public List<ObservationUnitEntity> getObservationUnits() {
+        return observationUnits;
+    }
+
+    public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
+        this.observationUnits = observationUnits;
+    }
+
+    public StudyEntity getStudy() {
+        return study;
+    }
+
+    public void setStudy(StudyEntity study) {
+        this.study = study;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/EventParameterEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/EventParameterEntity.java
index 9c939f17..af9645e3 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/EventParameterEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/EventParameterEntity.java
@@ -1,116 +1,111 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
+import java.util.List;
+
 @Entity
 @Table(name = "event_param")
 public class EventParameterEntity extends BrAPIBaseEntity {
-	@Column
-	private String key;
-	@Column
-	private String rdfValue;
-	@Column
-	private String value;
-	@Column
-	private String code;
-	@Column
-	private String description;
-	@Column
-	private String name;
-	@Column
-	private String units;
-	@Column
-	private String valueDescription;
-	@ElementCollection
-	private List<String> valuesByDate;
-	@ManyToOne
-	private EventEntity event;
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getUnits() {
-		return units;
-	}
-
-	public void setUnits(String units) {
-		this.units = units;
-	}
-
-	public String getValueDescription() {
-		return valueDescription;
-	}
-
-	public void setValueDescription(String valueDescription) {
-		this.valueDescription = valueDescription;
-	}
-
-	public List<String> getValuesByDate() {
-		return valuesByDate;
-	}
-
-	public void setValuesByDate(List<String> valuesByDate) {
-		this.valuesByDate = valuesByDate;
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getRdfValue() {
-		return rdfValue;
-	}
-
-	public void setRdfValue(String rdfValue) {
-		this.rdfValue = rdfValue;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public EventEntity getEvent() {
-		return event;
-	}
-
-	public void setEvent(EventEntity event) {
-		this.event = event;
-	}
+    @Column
+    private String key;
+    @Column
+    private String rdfValue;
+    @Column
+    private String value;
+    @Column
+    private String code;
+    @Column
+    private String description;
+    @Column
+    private String name;
+    @Column
+    private String units;
+    @Column
+    private String valueDescription;
+    @ElementCollection
+    private List<String> valuesByDate;
+    @ManyToOne
+    private EventEntity event;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
+
+    public String getValueDescription() {
+        return valueDescription;
+    }
+
+    public void setValueDescription(String valueDescription) {
+        this.valueDescription = valueDescription;
+    }
+
+    public List<String> getValuesByDate() {
+        return valuesByDate;
+    }
+
+    public void setValuesByDate(List<String> valuesByDate) {
+        this.valuesByDate = valuesByDate;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getRdfValue() {
+        return rdfValue;
+    }
+
+    public void setRdfValue(String rdfValue) {
+        this.rdfValue = rdfValue;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public EventEntity getEvent() {
+        return event;
+    }
+
+    public void setEvent(EventEntity event) {
+        this.event = event;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ImageEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ImageEntity.java
index 916e0737..04d49215 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ImageEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ImageEntity.java
@@ -1,174 +1,165 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.GeoJSONEntity;
 
+import java.util.Date;
+import java.util.List;
+
 @Entity
 @Table(name = "image")
 public class ImageEntity extends BrAPIPrimaryEntity {
-	@Column
-	private byte[] imageData;
-	@ManyToOne(cascade = CascadeType.DETACH)
-	private ObservationUnitEntity observationUnit;
-	@Column
-	private String name;
-	@Column
-	private String imageFileName;
-	@Column
-	private String description;
-	@Column
-	private String imageURL;
-	@Column
-	private Integer imageFileSize;
-	@Column
-	private Integer imageHeight;
-	@Column
-	private Integer imageWidth;
-	@Column
-	private String imageMIMEType;
-	@ElementCollection
-	private List<String> descriptiveOntologyTerms;
-	@ManyToMany
-	@JoinTable
-	private List<ObservationEntity> observations;
-	@Column
-	private String copyright;
-	@Column
-	private Date timeStamp;
-	@OneToOne(cascade = CascadeType.ALL)
-	private GeoJSONEntity coordinates;
-
-	public List<String> getDescriptiveOntologyTerms() {
-		return descriptiveOntologyTerms;
-	}
-
-	public void setDescriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-		this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-	}
-
-	public String getCopyright() {
-		return copyright;
-	}
-
-	public void setCopyright(String copyright) {
-		this.copyright = copyright;
-	}
-
-	public Date getTimeStamp() {
-		return timeStamp;
-	}
-
-	public void setTimeStamp(Date timeStamp) {
-		this.timeStamp = timeStamp;
-	}
-
-	public GeoJSONEntity getCoordinates() {
-		return coordinates;
-	}
-
-	public void setCoordinates(GeoJSONEntity coordinates) {
-		this.coordinates = coordinates;
-	}
-
-	public byte[] getImageData() {
-		return imageData;
-	}
-
-	public void setImageData(byte[] imageData) {
-		this.imageData = imageData;
-	}
-
-	public ObservationUnitEntity getObservationUnit() {
-		return observationUnit;
-	}
-
-	public void setObservationUnit(ObservationUnitEntity observationUnit) {
-		this.observationUnit = observationUnit;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getImageFileName() {
-		return imageFileName;
-	}
-
-	public void setImageFileName(String imageFileName) {
-		this.imageFileName = imageFileName;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getImageURL() {
-		return imageURL;
-	}
-
-	public void setImageURL(String imageURL) {
-		this.imageURL = imageURL;
-	}
-
-	public Integer getImageFileSize() {
-		return imageFileSize;
-	}
-
-	public void setImageFileSize(Integer imageFileSize) {
-		this.imageFileSize = imageFileSize;
-	}
-
-	public Integer getImageHeight() {
-		return imageHeight;
-	}
-
-	public void setImageHeight(Integer imageHeight) {
-		this.imageHeight = imageHeight;
-	}
-
-	public Integer getImageWidth() {
-		return imageWidth;
-	}
+    @Column
+    private byte[] imageData;
+    @ManyToOne(cascade = CascadeType.DETACH)
+    private ObservationUnitEntity observationUnit;
+    @Column
+    private String name;
+    @Column
+    private String imageFileName;
+    @Column
+    private String description;
+    @Column
+    private String imageURL;
+    @Column
+    private Integer imageFileSize;
+    @Column
+    private Integer imageHeight;
+    @Column
+    private Integer imageWidth;
+    @Column
+    private String imageMIMEType;
+    @ElementCollection
+    private List<String> descriptiveOntologyTerms;
+    @ManyToMany
+    @JoinTable
+    private List<ObservationEntity> observations;
+    @Column
+    private String copyright;
+    @Column
+    private Date timeStamp;
+    @OneToOne(cascade = CascadeType.ALL)
+    private GeoJSONEntity coordinates;
+
+    public List<String> getDescriptiveOntologyTerms() {
+        return descriptiveOntologyTerms;
+    }
+
+    public void setDescriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
+        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
+    }
+
+    public String getCopyright() {
+        return copyright;
+    }
+
+    public void setCopyright(String copyright) {
+        this.copyright = copyright;
+    }
+
+    public Date getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(Date timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public GeoJSONEntity getCoordinates() {
+        return coordinates;
+    }
+
+    public void setCoordinates(GeoJSONEntity coordinates) {
+        this.coordinates = coordinates;
+    }
+
+    public byte[] getImageData() {
+        return imageData;
+    }
+
+    public void setImageData(byte[] imageData) {
+        this.imageData = imageData;
+    }
+
+    public ObservationUnitEntity getObservationUnit() {
+        return observationUnit;
+    }
+
+    public void setObservationUnit(ObservationUnitEntity observationUnit) {
+        this.observationUnit = observationUnit;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getImageFileName() {
+        return imageFileName;
+    }
+
+    public void setImageFileName(String imageFileName) {
+        this.imageFileName = imageFileName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getImageURL() {
+        return imageURL;
+    }
+
+    public void setImageURL(String imageURL) {
+        this.imageURL = imageURL;
+    }
+
+    public Integer getImageFileSize() {
+        return imageFileSize;
+    }
+
+    public void setImageFileSize(Integer imageFileSize) {
+        this.imageFileSize = imageFileSize;
+    }
+
+    public Integer getImageHeight() {
+        return imageHeight;
+    }
+
+    public void setImageHeight(Integer imageHeight) {
+        this.imageHeight = imageHeight;
+    }
+
+    public Integer getImageWidth() {
+        return imageWidth;
+    }
 
-	public void setImageWidth(Integer imageWidth) {
-		this.imageWidth = imageWidth;
-	}
+    public void setImageWidth(Integer imageWidth) {
+        this.imageWidth = imageWidth;
+    }
 
-	public String getImageMIMEType() {
-		return imageMIMEType;
-	}
+    public String getImageMIMEType() {
+        return imageMIMEType;
+    }
 
-	public void setImageMIMEType(String imageMIMEType) {
-		this.imageMIMEType = imageMIMEType;
-	}
+    public void setImageMIMEType(String imageMIMEType) {
+        this.imageMIMEType = imageMIMEType;
+    }
 
-	public List<ObservationEntity> getObservations() {
-		return observations;
-	}
+    public List<ObservationEntity> getObservations() {
+        return observations;
+    }
 
-	public void setObservations(List<ObservationEntity> observations) {
-		this.observations = observations;
-	}
+    public void setObservations(List<ObservationEntity> observations) {
+        this.observations = observations;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/MethodEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/MethodEntity.java
index 0fb71883..9a58f027 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/MethodEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/MethodEntity.java
@@ -1,92 +1,102 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
+import jakarta.persistence.*;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+@Entity
+@Table(name = "method")
+public class MethodEntity extends BrAPIPrimaryEntity implements OntologyReferenceHolder {
+    @Column
+    private String name;
+    @Column
+    private String methodClass;
+    @Column
+    private String methodPUI;
+    @Column
+    private String description;
+    @Column
+    private String formula;
+    @Column
+    private String reference;
+    @OneToMany(mappedBy = "method")
+    private List<VariableBaseEntity> variables;
+    @OneToOne
+    private OntologyEntity ontology;
+    @JoinTable
+    @OneToMany(cascade = CascadeType.ALL)
+    private List<OntologyReferenceEntity> ontologyReference;
+
+    public String getMethodPUI() {
+        return methodPUI;
+    }
 
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+    public void setMethodPUI(String methodPUI) {
+        this.methodPUI = methodPUI;
+    }
 
-@Entity
-@Table(name="method")
-public class MethodEntity extends BrAPIPrimaryEntity implements OntologyReferenceHolder{
-	@Column
-	private String name;
-	@Column
-	private String methodClass;
-	@Column
-	private String methodPUI;
-	@Column
-	private String description;
-	@Column
-	private String formula;
-	@Column
-	private String reference;
-	@OneToMany(mappedBy="method")
-	private List<VariableBaseEntity> variables;
-	@OneToOne
-	private OntologyEntity ontology;
-	@JoinTable
-	@OneToMany(cascade = CascadeType.ALL)
-	private List<OntologyReferenceEntity> ontologyReference;
-
-	public String getMethodPUI() {
-		return methodPUI;
-	}
-	public void setMethodPUI(String methodPUI) {
-		this.methodPUI = methodPUI;
-	}
-	public OntologyEntity getOntology() {
-		return ontology;
-	}
-	public void setOntology(OntologyEntity ontology) {
-		this.ontology = ontology;
-	}
-	public List<OntologyReferenceEntity> getOntologyReference() {
-		return ontologyReference;
-	}
-	public void setOntologyReference(List<OntologyReferenceEntity> ontologyReference) {
-		this.ontologyReference = ontologyReference;
-	}
-	public List<VariableBaseEntity> getVariables() {
-		return variables;
-	}
-	public void setVariables(List<VariableBaseEntity> variables) {
-		this.variables = variables;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getMethodClass() {
-		return methodClass;
-	}
-	public void setMethodClass(String methodClass) {
-		this.methodClass = methodClass;
-	}
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	public String getFormula() {
-		return formula;
-	}
-	public void setFormula(String formula) {
-		this.formula = formula;
-	}
-	public String getReference() {
-		return reference;
-	}
-	public void setReference(String reference) {
-		this.reference = reference;
-	}
+    public OntologyEntity getOntology() {
+        return ontology;
+    }
+
+    public void setOntology(OntologyEntity ontology) {
+        this.ontology = ontology;
+    }
+
+    public List<OntologyReferenceEntity> getOntologyReference() {
+        return ontologyReference;
+    }
+
+    public void setOntologyReference(List<OntologyReferenceEntity> ontologyReference) {
+        this.ontologyReference = ontologyReference;
+    }
+
+    public List<VariableBaseEntity> getVariables() {
+        return variables;
+    }
+
+    public void setVariables(List<VariableBaseEntity> variables) {
+        this.variables = variables;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMethodClass() {
+        return methodClass;
+    }
+
+    public void setMethodClass(String methodClass) {
+        this.methodClass = methodClass;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getFormula() {
+        return formula;
+    }
+
+    public void setFormula(String formula) {
+        this.formula = formula;
+    }
+
+    public String getReference() {
+        return reference;
+    }
+
+    public void setReference(String reference) {
+        this.reference = reference;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationEntity.java
index 150f2e05..2597f72d 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationEntity.java
@@ -1,152 +1,142 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.GeoJSONEntity;
-import org.brapi.test.BrAPITestServer.model.entity.core.CropEntity;
-import org.brapi.test.BrAPITestServer.model.entity.core.ProgramEntity;
-import org.brapi.test.BrAPITestServer.model.entity.core.SeasonEntity;
-import org.brapi.test.BrAPITestServer.model.entity.core.StudyEntity;
-import org.brapi.test.BrAPITestServer.model.entity.core.TrialEntity;
+import org.brapi.test.BrAPITestServer.model.entity.core.*;
+
+import java.util.Date;
 
 @Entity
 @Table(name = "observation")
 public class ObservationEntity extends BrAPIPrimaryEntity {
-	@Column
-	private String collector;
-	@Column
-	private Date observationTimeStamp;
-	@ManyToOne
-	private ObservationVariableEntity observationVariable;
-	@ManyToOne
-	private SeasonEntity season;
-	@Column
-	private String uploadedBy;
-	@Column
-	private String value;
-	@ManyToOne
-	private CropEntity crop;
-	@ManyToOne
-	private ProgramEntity program;
-	@ManyToOne
-	private TrialEntity trial;
-	@ManyToOne
-	private StudyEntity study;
-	@ManyToOne
-	private ObservationUnitEntity observationUnit;
-	@OneToOne(cascade = CascadeType.ALL)
-	private GeoJSONEntity geoCoordinates;
-
-	public GeoJSONEntity getGeoCoordinates() {
-		return geoCoordinates;
-	}
-
-	public void setGeoCoordinates(GeoJSONEntity geoCoordinates) {
-		this.geoCoordinates = geoCoordinates;
-	}
-
-	public CropEntity getCrop() {
-		return crop;
-	}
-
-	public void setCrop(CropEntity crop) {
-		this.crop = crop;
-	}
-
-	public ProgramEntity getProgram() {
-		return program;
-	}
-
-	public void setProgram(ProgramEntity program) {
-		this.program = program;
-		if (program.getCrop() != null)
-			setCrop(program.getCrop());
-	}
-
-	public TrialEntity getTrial() {
-		return trial;
-	}
-
-	public void setTrial(TrialEntity trial) {
-		this.trial = trial;
-		if (trial.getProgram() != null)
-			setProgram(trial.getProgram());
-	}
-
-	public StudyEntity getStudy() {
-		return study;
-	}
-
-	public void setStudy(StudyEntity study) {
-		this.study = study;
-		if (study.getTrial() != null)
-			setTrial(study.getTrial());
-	}
-
-	public String getUploadedBy() {
-		return uploadedBy;
-	}
-
-	public void setUploadedBy(String uploadedBy) {
-		this.uploadedBy = uploadedBy;
-	}
-
-	public ObservationUnitEntity getObservationUnit() {
-		return observationUnit;
-	}
-
-	public void setObservationUnit(ObservationUnitEntity observationUnit) {
-		this.observationUnit = observationUnit;
-		if (observationUnit.getStudy() != null)
-			setStudy(observationUnit.getStudy());
-	}
-
-	public Date getObservationTimeStamp() {
-		return observationTimeStamp;
-	}
-
-	public void setObservationTimeStamp(Date observationTimeStamp) {
-		this.observationTimeStamp = observationTimeStamp;
-	}
-
-	public String getCollector() {
-		return collector;
-	}
-
-	public void setCollector(String collector) {
-		this.collector = collector;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public ObservationVariableEntity getObservationVariable() {
-		return observationVariable;
-	}
-
-	public void setObservationVariable(ObservationVariableEntity observationVariable) {
-		this.observationVariable = observationVariable;
-	}
-
-	public SeasonEntity getSeason() {
-		return season;
-	}
-
-	public void setSeason(SeasonEntity season) {
-		this.season = season;
-	}
+    @Column
+    private String collector;
+    @Column
+    private Date observationTimeStamp;
+    @ManyToOne
+    private ObservationVariableEntity observationVariable;
+    @ManyToOne
+    private SeasonEntity season;
+    @Column
+    private String uploadedBy;
+    @Column
+    private String value;
+    @ManyToOne
+    private CropEntity crop;
+    @ManyToOne
+    private ProgramEntity program;
+    @ManyToOne
+    private TrialEntity trial;
+    @ManyToOne
+    private StudyEntity study;
+    @ManyToOne
+    private ObservationUnitEntity observationUnit;
+    @OneToOne(cascade = CascadeType.ALL)
+    private GeoJSONEntity geoCoordinates;
+
+    public GeoJSONEntity getGeoCoordinates() {
+        return geoCoordinates;
+    }
+
+    public void setGeoCoordinates(GeoJSONEntity geoCoordinates) {
+        this.geoCoordinates = geoCoordinates;
+    }
+
+    public CropEntity getCrop() {
+        return crop;
+    }
+
+    public void setCrop(CropEntity crop) {
+        this.crop = crop;
+    }
+
+    public ProgramEntity getProgram() {
+        return program;
+    }
+
+    public void setProgram(ProgramEntity program) {
+        this.program = program;
+        if (program.getCrop() != null)
+            setCrop(program.getCrop());
+    }
+
+    public TrialEntity getTrial() {
+        return trial;
+    }
+
+    public void setTrial(TrialEntity trial) {
+        this.trial = trial;
+        if (trial.getProgram() != null)
+            setProgram(trial.getProgram());
+    }
+
+    public StudyEntity getStudy() {
+        return study;
+    }
+
+    public void setStudy(StudyEntity study) {
+        this.study = study;
+        if (study.getTrial() != null)
+            setTrial(study.getTrial());
+    }
+
+    public String getUploadedBy() {
+        return uploadedBy;
+    }
+
+    public void setUploadedBy(String uploadedBy) {
+        this.uploadedBy = uploadedBy;
+    }
+
+    public ObservationUnitEntity getObservationUnit() {
+        return observationUnit;
+    }
+
+    public void setObservationUnit(ObservationUnitEntity observationUnit) {
+        this.observationUnit = observationUnit;
+        if (observationUnit.getStudy() != null)
+            setStudy(observationUnit.getStudy());
+    }
+
+    public Date getObservationTimeStamp() {
+        return observationTimeStamp;
+    }
+
+    public void setObservationTimeStamp(Date observationTimeStamp) {
+        this.observationTimeStamp = observationTimeStamp;
+    }
+
+    public String getCollector() {
+        return collector;
+    }
+
+    public void setCollector(String collector) {
+        this.collector = collector;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public ObservationVariableEntity getObservationVariable() {
+        return observationVariable;
+    }
+
+    public void setObservationVariable(ObservationVariableEntity observationVariable) {
+        this.observationVariable = observationVariable;
+    }
+
+    public SeasonEntity getSeason() {
+        return season;
+    }
+
+    public void setSeason(SeasonEntity season) {
+        this.season = season;
+    }
 
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitEntity.java
index fe8656e2..9fd08b7c 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitEntity.java
@@ -1,15 +1,6 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.CropEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.ProgramEntity;
@@ -19,115 +10,140 @@
 import org.brapi.test.BrAPITestServer.model.entity.germ.GermplasmEntity;
 import org.brapi.test.BrAPITestServer.model.entity.germ.SeedLotEntity;
 
+import java.util.List;
+
 @Entity
 @Table(name = "observation_unit")
 public class ObservationUnitEntity extends BrAPIPrimaryEntity {
-	@ManyToOne
-	private CrossEntity cross;
-	@ManyToOne
-	private GermplasmEntity germplasm;
-	@Column
-	private String observationUnitName;
-	@Column
-	private String observationUnitPUI;
-	@ManyToOne
-	private SeedLotEntity seedLot;
-	@OneToMany(mappedBy="observationUnit", cascade=CascadeType.ALL)
-	private List<TreatmentEntity> treatments;
-	@OneToOne(mappedBy="observationUnit", cascade=CascadeType.ALL)
-	private ObservationUnitPositionEntity position;
-	@ManyToOne
-	private CropEntity crop;
-	@ManyToOne
-	private ProgramEntity program;
-	@ManyToOne
-	private TrialEntity trial;
-	@ManyToOne
-	private StudyEntity study;
-	@OneToMany(mappedBy="observationUnit", cascade=CascadeType.ALL)
-	private List<ObservationEntity> observations;
-	
-	
-	public CrossEntity getCross() {
-		return cross;
-	}
-	public void setCross(CrossEntity cross) {
-		this.cross = cross;
-	}
-	public CropEntity getCrop() {
-		return crop;
-	}
-	public void setCrop(CropEntity crop) {
-		this.crop = crop;
-	}
-	public ProgramEntity getProgram() {
-		return program;
-	}
-	public void setProgram(ProgramEntity program) {
-		this.program = program;
-		if (program.getCrop() != null)
-			setCrop(program.getCrop());
-	}
-	public TrialEntity getTrial() {
-		return trial;
-	}
-	public void setTrial(TrialEntity trial) {
-		this.trial = trial;
-		if (trial.getProgram() != null)
-			setProgram(trial.getProgram());
-		if (trial.getCrop() != null)
-			setCrop(trial.getCrop());
-	}
-	public StudyEntity getStudy() {
-		return study;
-	}
-	public void setStudy(StudyEntity study) {
-		this.study = study;
-		if (study.getTrial() != null)
-			setTrial(study.getTrial());
-		if (study.getCrop() != null)
-			setCrop(study.getCrop());
-	}
-	public GermplasmEntity getGermplasm() {
-		return germplasm;
-	}
-	public void setGermplasm(GermplasmEntity germplasm) {
-		this.germplasm = germplasm;
-	}
-	public String getObservationUnitName() {
-		return observationUnitName;
-	}
-	public void setObservationUnitName(String observationUnitName) {
-		this.observationUnitName = observationUnitName;
-	}
-	public String getObservationUnitPUI() {
-		return observationUnitPUI;
-	}
-	public void setObservationUnitPUI(String observationUnitPUI) {
-		this.observationUnitPUI = observationUnitPUI;
-	}
-	public SeedLotEntity getSeedLot() {
-		return seedLot;
-	}
-	public void setSeedLot(SeedLotEntity seedLot) {
-		this.seedLot = seedLot;
-	}
-	public List<TreatmentEntity> getTreatments() {
-		return treatments;
-	}
-	public void setTreatments(List<TreatmentEntity> treatments) {
-		this.treatments = treatments;
-	}
-	public ObservationUnitPositionEntity getPosition() {
-		return position;
-	}
-	public void setPosition(ObservationUnitPositionEntity position) {
-		this.position = position;
-	}
-	public List<ObservationEntity> getObservations() {
-		return observations;
-	}
-	public void setObservations(List<ObservationEntity> observations) {
-		this.observations = observations;
-	}
+    @ManyToOne
+    private CrossEntity cross;
+    @ManyToOne
+    private GermplasmEntity germplasm;
+    @Column
+    private String observationUnitName;
+    @Column
+    private String observationUnitPUI;
+    @ManyToOne
+    private SeedLotEntity seedLot;
+    @OneToMany(mappedBy = "observationUnit", cascade = CascadeType.ALL)
+    private List<TreatmentEntity> treatments;
+    @OneToOne(mappedBy = "observationUnit", cascade = CascadeType.ALL)
+    private ObservationUnitPositionEntity position;
+    @ManyToOne
+    private CropEntity crop;
+    @ManyToOne
+    private ProgramEntity program;
+    @ManyToOne
+    private TrialEntity trial;
+    @ManyToOne
+    private StudyEntity study;
+    @OneToMany(mappedBy = "observationUnit", cascade = CascadeType.ALL)
+    private List<ObservationEntity> observations;
+
+
+    public CrossEntity getCross() {
+        return cross;
+    }
+
+    public void setCross(CrossEntity cross) {
+        this.cross = cross;
+    }
+
+    public CropEntity getCrop() {
+        return crop;
+    }
+
+    public void setCrop(CropEntity crop) {
+        this.crop = crop;
+    }
+
+    public ProgramEntity getProgram() {
+        return program;
+    }
+
+    public void setProgram(ProgramEntity program) {
+        this.program = program;
+        if (program.getCrop() != null)
+            setCrop(program.getCrop());
+    }
+
+    public TrialEntity getTrial() {
+        return trial;
+    }
+
+    public void setTrial(TrialEntity trial) {
+        this.trial = trial;
+        if (trial.getProgram() != null)
+            setProgram(trial.getProgram());
+        if (trial.getCrop() != null)
+            setCrop(trial.getCrop());
+    }
+
+    public StudyEntity getStudy() {
+        return study;
+    }
+
+    public void setStudy(StudyEntity study) {
+        this.study = study;
+        if (study.getTrial() != null)
+            setTrial(study.getTrial());
+        if (study.getCrop() != null)
+            setCrop(study.getCrop());
+    }
+
+    public GermplasmEntity getGermplasm() {
+        return germplasm;
+    }
+
+    public void setGermplasm(GermplasmEntity germplasm) {
+        this.germplasm = germplasm;
+    }
+
+    public String getObservationUnitName() {
+        return observationUnitName;
+    }
+
+    public void setObservationUnitName(String observationUnitName) {
+        this.observationUnitName = observationUnitName;
+    }
+
+    public String getObservationUnitPUI() {
+        return observationUnitPUI;
+    }
+
+    public void setObservationUnitPUI(String observationUnitPUI) {
+        this.observationUnitPUI = observationUnitPUI;
+    }
+
+    public SeedLotEntity getSeedLot() {
+        return seedLot;
+    }
+
+    public void setSeedLot(SeedLotEntity seedLot) {
+        this.seedLot = seedLot;
+    }
+
+    public List<TreatmentEntity> getTreatments() {
+        return treatments;
+    }
+
+    public void setTreatments(List<TreatmentEntity> treatments) {
+        this.treatments = treatments;
+    }
+
+    public ObservationUnitPositionEntity getPosition() {
+        return position;
+    }
+
+    public void setPosition(ObservationUnitPositionEntity position) {
+        this.position = position;
+    }
+
+    public List<ObservationEntity> getObservations() {
+        return observations;
+    }
+
+    public void setObservations(List<ObservationEntity> observations) {
+        this.observations = observations;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitLevelRelationshipEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitLevelRelationshipEntity.java
index 6a3af8ee..5d9baf7d 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitLevelRelationshipEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitLevelRelationshipEntity.java
@@ -1,56 +1,63 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
-
 import io.swagger.model.pheno.ObservationUnitHierarchyLevelEnum;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "observation_unit_level")
 public class ObservationUnitLevelRelationshipEntity extends BrAPIBaseEntity {
-	@Column
-	private String levelCode;
-	@Column
-	private ObservationUnitHierarchyLevelEnum levelName;
-	@Column
-	private Integer levelOrder;
-	@ManyToOne
-	private ObservationUnitEntity observationUnit;
-	@ManyToOne
-	private ObservationUnitPositionEntity position;
-	
-	public ObservationUnitEntity getObservationUnit() {
-		return observationUnit;
-	}
-	public void setObservationUnit(ObservationUnitEntity observationUnit) {
-		this.observationUnit = observationUnit;
-	}
-	public String getLevelCode() {
-		return levelCode;
-	}
-	public void setLevelCode(String levelCode) {
-		this.levelCode = levelCode;
-	}
-	public ObservationUnitHierarchyLevelEnum getLevelName() {
-		return levelName;
-	}
-	public void setLevelName(ObservationUnitHierarchyLevelEnum levelName) {
-		this.levelName = levelName;
-	}
-	public Integer getLevelOrder() {
-		return levelOrder;
-	}
-	public void setLevelOrder(Integer levelOrder) {
-		this.levelOrder = levelOrder;
-	}
-	public ObservationUnitPositionEntity getPosition() {
-		return position;
-	}
-	public void setPosition(ObservationUnitPositionEntity position) {
-		this.position = position;
-	}
+    @Column
+    private String levelCode;
+    @Column
+    private ObservationUnitHierarchyLevelEnum levelName;
+    @Column
+    private Integer levelOrder;
+    @ManyToOne
+    private ObservationUnitEntity observationUnit;
+    @ManyToOne
+    private ObservationUnitPositionEntity position;
+
+    public ObservationUnitEntity getObservationUnit() {
+        return observationUnit;
+    }
+
+    public void setObservationUnit(ObservationUnitEntity observationUnit) {
+        this.observationUnit = observationUnit;
+    }
+
+    public String getLevelCode() {
+        return levelCode;
+    }
+
+    public void setLevelCode(String levelCode) {
+        this.levelCode = levelCode;
+    }
+
+    public ObservationUnitHierarchyLevelEnum getLevelName() {
+        return levelName;
+    }
+
+    public void setLevelName(ObservationUnitHierarchyLevelEnum levelName) {
+        this.levelName = levelName;
+    }
+
+    public Integer getLevelOrder() {
+        return levelOrder;
+    }
+
+    public void setLevelOrder(Integer levelOrder) {
+        this.levelOrder = levelOrder;
+    }
+
+    public ObservationUnitPositionEntity getPosition() {
+        return position;
+    }
+
+    public void setPosition(ObservationUnitPositionEntity position) {
+        this.position = position;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitPositionEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitPositionEntity.java
index 844bf835..89cdf4a0 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitPositionEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitPositionEntity.java
@@ -1,169 +1,163 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
-import org.brapi.test.BrAPITestServer.model.entity.GeoJSONEntity;
-
 import io.swagger.model.pheno.EntryTypeEnum;
 import io.swagger.model.pheno.ObservationUnitHierarchyLevelEnum;
 import io.swagger.model.pheno.PositionCoordinateTypeEnum;
+import jakarta.persistence.*;
+import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import org.brapi.test.BrAPITestServer.model.entity.GeoJSONEntity;
+
+import java.util.List;
 
 @Entity
 @Table(name = "observation_unit_position")
 public class ObservationUnitPositionEntity extends BrAPIBaseEntity {
-	@Column
-	private EntryTypeEnum entryType;
-	@OneToOne(cascade = CascadeType.ALL)
-	private GeoJSONEntity geoCoordinates;
-	@Column
-	private String levelCode;
-	@Column
-	private ObservationUnitHierarchyLevelEnum levelName;
-	@Column
-	private Integer levelOrder;
-	@OneToMany(mappedBy = "position", cascade = CascadeType.ALL)
-	private List<ObservationUnitLevelRelationshipEntity> observationLevelRelationships;
-	@Column
-	private String positionCoordinateX;
-	@Column
-	private PositionCoordinateTypeEnum positionCoordinateXType;
-	@Column
-	private String positionCoordinateY;
-	@Column
-	private PositionCoordinateTypeEnum positionCoordinateYType;
-	@OneToOne
-	private ObservationUnitEntity observationUnit;
-
-	public ObservationUnitEntity getObservationUnit() {
-		return observationUnit;
-	}
-
-	public void setObservationUnit(ObservationUnitEntity observationUnit) {
-		this.observationUnit = observationUnit;
-	}
-
-	public EntryTypeEnum getEntryType() {
-		return entryType;
-	}
-
-	public void setEntryType(EntryTypeEnum entryType) {
-		this.entryType = entryType;
-	}
-
-	public GeoJSONEntity getGeoCoordinates() {
-		return geoCoordinates;
-	}
-
-	public void setGeoCoordinates(GeoJSONEntity geoCoordinates) {
-		this.geoCoordinates = geoCoordinates;
-	}
-
-	public String getLevelCode() {
-		return levelCode;
-	}
-
-	public void setLevelCode(String levelCode) {
-		this.levelCode = levelCode;
-	}
-
-	public ObservationUnitHierarchyLevelEnum getLevelName() {
-		return levelName;
-	}
-
-	public void setLevelName(ObservationUnitHierarchyLevelEnum levelName) {
-		this.levelName = levelName;
-	}
-
-	public Integer getLevelOrder() {
-		return levelOrder;
-	}
-
-	public void setLevelOrder(Integer levelOrder) {
-		this.levelOrder = levelOrder;
-	}
-
-	public List<ObservationUnitLevelRelationshipEntity> getObservationLevelRelationships() {
-		return observationLevelRelationships;
-	}
-
-	public void setObservationLevelRelationships(
-			List<ObservationUnitLevelRelationshipEntity> observationLevelRelationships) {
-		this.observationLevelRelationships = observationLevelRelationships;
-	}
-
-	public String getPositionCoordinateX() {
-		return positionCoordinateX;
-	}
-
-	public void setPositionCoordinateX(String positionCoordinateX) {
-		this.positionCoordinateX = positionCoordinateX;
-	}
-
-	public PositionCoordinateTypeEnum getPositionCoordinateXType() {
-		return positionCoordinateXType;
-	}
-
-	public void setPositionCoordinateXType(PositionCoordinateTypeEnum positionCoordinateXType) {
-		this.positionCoordinateXType = positionCoordinateXType;
-	}
-
-	public String getPositionCoordinateY() {
-		return positionCoordinateY;
-	}
-
-	public void setPositionCoordinateY(String positionCoordinateY) {
-		this.positionCoordinateY = positionCoordinateY;
-	}
-
-	public PositionCoordinateTypeEnum getPositionCoordinateYType() {
-		return positionCoordinateYType;
-	}
-
-	public void setPositionCoordinateYType(PositionCoordinateTypeEnum positionCoordinateYType) {
-		this.positionCoordinateYType = positionCoordinateYType;
-	}
-
-	public String getFieldCode() {
-		return getRelationshipCode(ObservationUnitHierarchyLevelEnum.FIELD);
-	}
-
-	public String getBlockCode() {
-		return getRelationshipCode(ObservationUnitHierarchyLevelEnum.BLOCK);
-	}
-
-	public String getEntryCode() {
-		return getRelationshipCode(ObservationUnitHierarchyLevelEnum.ENTRY);
-	}
-
-	public String getRepCode() {
-		return getRelationshipCode(ObservationUnitHierarchyLevelEnum.REP);
-	}
-
-	public String getPlotCode() {
-		return getRelationshipCode(ObservationUnitHierarchyLevelEnum.PLOT);
-	}
-
-	public String getPlantCode() {
-		return getRelationshipCode(ObservationUnitHierarchyLevelEnum.PLANT);
-	}
-	
-	private String getRelationshipCode(ObservationUnitHierarchyLevelEnum level) {
-		if(getLevelName() == level) {
-			return getLevelCode();
-		}else {
-			for(ObservationUnitLevelRelationshipEntity rel : getObservationLevelRelationships()) {
-				if(rel.getLevelName() == level) {
-					return rel.getLevelCode();
-				}
-			}
-		}
-		return null;
-	}
+    @Column
+    private EntryTypeEnum entryType;
+    @OneToOne(cascade = CascadeType.ALL)
+    private GeoJSONEntity geoCoordinates;
+    @Column
+    private String levelCode;
+    @Column
+    private ObservationUnitHierarchyLevelEnum levelName;
+    @Column
+    private Integer levelOrder;
+    @OneToMany(mappedBy = "position", cascade = CascadeType.ALL)
+    private List<ObservationUnitLevelRelationshipEntity> observationLevelRelationships;
+    @Column
+    private String positionCoordinateX;
+    @Column
+    private PositionCoordinateTypeEnum positionCoordinateXType;
+    @Column
+    private String positionCoordinateY;
+    @Column
+    private PositionCoordinateTypeEnum positionCoordinateYType;
+    @OneToOne
+    private ObservationUnitEntity observationUnit;
+
+    public ObservationUnitEntity getObservationUnit() {
+        return observationUnit;
+    }
+
+    public void setObservationUnit(ObservationUnitEntity observationUnit) {
+        this.observationUnit = observationUnit;
+    }
+
+    public EntryTypeEnum getEntryType() {
+        return entryType;
+    }
+
+    public void setEntryType(EntryTypeEnum entryType) {
+        this.entryType = entryType;
+    }
+
+    public GeoJSONEntity getGeoCoordinates() {
+        return geoCoordinates;
+    }
+
+    public void setGeoCoordinates(GeoJSONEntity geoCoordinates) {
+        this.geoCoordinates = geoCoordinates;
+    }
+
+    public String getLevelCode() {
+        return levelCode;
+    }
+
+    public void setLevelCode(String levelCode) {
+        this.levelCode = levelCode;
+    }
+
+    public ObservationUnitHierarchyLevelEnum getLevelName() {
+        return levelName;
+    }
+
+    public void setLevelName(ObservationUnitHierarchyLevelEnum levelName) {
+        this.levelName = levelName;
+    }
+
+    public Integer getLevelOrder() {
+        return levelOrder;
+    }
+
+    public void setLevelOrder(Integer levelOrder) {
+        this.levelOrder = levelOrder;
+    }
+
+    public List<ObservationUnitLevelRelationshipEntity> getObservationLevelRelationships() {
+        return observationLevelRelationships;
+    }
+
+    public void setObservationLevelRelationships(
+            List<ObservationUnitLevelRelationshipEntity> observationLevelRelationships) {
+        this.observationLevelRelationships = observationLevelRelationships;
+    }
+
+    public String getPositionCoordinateX() {
+        return positionCoordinateX;
+    }
+
+    public void setPositionCoordinateX(String positionCoordinateX) {
+        this.positionCoordinateX = positionCoordinateX;
+    }
+
+    public PositionCoordinateTypeEnum getPositionCoordinateXType() {
+        return positionCoordinateXType;
+    }
+
+    public void setPositionCoordinateXType(PositionCoordinateTypeEnum positionCoordinateXType) {
+        this.positionCoordinateXType = positionCoordinateXType;
+    }
+
+    public String getPositionCoordinateY() {
+        return positionCoordinateY;
+    }
+
+    public void setPositionCoordinateY(String positionCoordinateY) {
+        this.positionCoordinateY = positionCoordinateY;
+    }
+
+    public PositionCoordinateTypeEnum getPositionCoordinateYType() {
+        return positionCoordinateYType;
+    }
+
+    public void setPositionCoordinateYType(PositionCoordinateTypeEnum positionCoordinateYType) {
+        this.positionCoordinateYType = positionCoordinateYType;
+    }
+
+    public String getFieldCode() {
+        return getRelationshipCode(ObservationUnitHierarchyLevelEnum.FIELD);
+    }
+
+    public String getBlockCode() {
+        return getRelationshipCode(ObservationUnitHierarchyLevelEnum.BLOCK);
+    }
+
+    public String getEntryCode() {
+        return getRelationshipCode(ObservationUnitHierarchyLevelEnum.ENTRY);
+    }
+
+    public String getRepCode() {
+        return getRelationshipCode(ObservationUnitHierarchyLevelEnum.REP);
+    }
+
+    public String getPlotCode() {
+        return getRelationshipCode(ObservationUnitHierarchyLevelEnum.PLOT);
+    }
+
+    public String getPlantCode() {
+        return getRelationshipCode(ObservationUnitHierarchyLevelEnum.PLANT);
+    }
+
+    private String getRelationshipCode(ObservationUnitHierarchyLevelEnum level) {
+        if (getLevelName() == level) {
+            return getLevelCode();
+        } else {
+            for (ObservationUnitLevelRelationshipEntity rel : getObservationLevelRelationships()) {
+                if (rel.getLevelName() == level) {
+                    return rel.getLevelCode();
+                }
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationVariableEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationVariableEntity.java
index 2fdf6920..aeb073a8 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationVariableEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationVariableEntity.java
@@ -1,39 +1,44 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.List;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import java.util.List;
 
 @Entity
-@Table(name="observation_variable")
-public class ObservationVariableEntity extends VariableBaseEntity{
-	@Column
-	private String name;
-	@Column
-	private String pui;
-	@OneToMany(mappedBy="observationVariable")
-	private List<ObservationEntity> observations;
-	
-	public String getPui() {
-		return pui;
-	}
-	public void setPui(String pui) {
-		this.pui = pui;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public List<ObservationEntity> getObservations() {
-		return observations;
-	}
-	public void setObservations(List<ObservationEntity> observations) {
-		this.observations = observations;
-	}
-	
+@Table(name = "observation_variable")
+public class ObservationVariableEntity extends VariableBaseEntity {
+    @Column
+    private String name;
+    @Column
+    private String pui;
+    @OneToMany(mappedBy = "observationVariable")
+    private List<ObservationEntity> observations;
+
+    public String getPui() {
+        return pui;
+    }
+
+    public void setPui(String pui) {
+        this.pui = pui;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<ObservationEntity> getObservations() {
+        return observations;
+    }
+
+    public void setObservations(List<ObservationEntity> observations) {
+        this.observations = observations;
+    }
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyEntity.java
index 3c8b6555..18aa794b 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyEntity.java
@@ -1,89 +1,101 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
+import java.util.List;
+
 @Entity
-@Table(name="ontology")
+@Table(name = "ontology")
 public class OntologyEntity extends BrAPIPrimaryEntity {
-	@Column
-	private String ontologyName;
-	@Column
-	private String authors;
-	@Column
-	private String version;
-	@Column
-	private String description;
-	@Column
-	private String copyright;
-	@Column
-	private String licence;
-	@Column
-	private String documentationURL;
-	@OneToMany(mappedBy="ontology")
-	private List<VariableBaseEntity> variables;
-	@ElementCollection
-	private List<String> documentationLinks;
-
-	public List<String> getDocumentationLinks() {
-		return documentationLinks;
-	}
-	public void setDocumentationLinks(List<String> documentationLinks) {
-		this.documentationLinks = documentationLinks;
-	}
-	public String getDocumentationURL() {
-		return documentationURL;
-	}
-	public void setDocumentationURL(String documentationURL) {
-		this.documentationURL = documentationURL;
-	}
-	public List<VariableBaseEntity> getVariables() {
-		return variables;
-	}
-	public void setVariables(List<VariableBaseEntity> variables) {
-		this.variables = variables;
-	}
-	public String getOntologyName() {
-		return ontologyName;
-	}
-	public void setOntologyName(String ontologyName) {
-		this.ontologyName = ontologyName;
-	}
-	public String getAuthors() {
-		return authors;
-	}
-	public void setAuthors(String authors) {
-		this.authors = authors;
-	}
-	public String getVersion() {
-		return version;
-	}
-	public void setVersion(String version) {
-		this.version = version;
-	}
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	public String getCopyright() {
-		return copyright;
-	}
-	public void setCopyright(String copyright) {
-		this.copyright = copyright;
-	}
-	public String getLicence() {
-		return licence;
-	}
-	public void setLicence(String licence) {
-		this.licence = licence;
-	}
+    @Column
+    private String ontologyName;
+    @Column
+    private String authors;
+    @Column
+    private String version;
+    @Column
+    private String description;
+    @Column
+    private String copyright;
+    @Column
+    private String licence;
+    @Column
+    private String documentationURL;
+    @OneToMany(mappedBy = "ontology")
+    private List<VariableBaseEntity> variables;
+    @ElementCollection
+    private List<String> documentationLinks;
+
+    public List<String> getDocumentationLinks() {
+        return documentationLinks;
+    }
+
+    public void setDocumentationLinks(List<String> documentationLinks) {
+        this.documentationLinks = documentationLinks;
+    }
+
+    public String getDocumentationURL() {
+        return documentationURL;
+    }
+
+    public void setDocumentationURL(String documentationURL) {
+        this.documentationURL = documentationURL;
+    }
+
+    public List<VariableBaseEntity> getVariables() {
+        return variables;
+    }
+
+    public void setVariables(List<VariableBaseEntity> variables) {
+        this.variables = variables;
+    }
+
+    public String getOntologyName() {
+        return ontologyName;
+    }
+
+    public void setOntologyName(String ontologyName) {
+        this.ontologyName = ontologyName;
+    }
+
+    public String getAuthors() {
+        return authors;
+    }
+
+    public void setAuthors(String authors) {
+        this.authors = authors;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getCopyright() {
+        return copyright;
+    }
+
+    public void setCopyright(String copyright) {
+        this.copyright = copyright;
+    }
+
+    public String getLicence() {
+        return licence;
+    }
+
+    public void setLicence(String licence) {
+        this.licence = licence;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyReferenceEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyReferenceEntity.java
index 984076f1..436efc88 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyReferenceEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyReferenceEntity.java
@@ -1,35 +1,33 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
 import io.swagger.model.OntologyReferenceTypeEnum;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
 @Table(name = "ontology_ref")
 public class OntologyReferenceEntity extends BrAPIBaseEntity {
-	@Column
-	private String URL;
-	@Column
-	private OntologyReferenceTypeEnum type;
-
-	public String getURL() {
-		return URL;
-	}
-
-	public void setURL(String uRL) {
-		URL = uRL;
-	}
-
-	public OntologyReferenceTypeEnum getType() {
-		return type;
-	}
-
-	public void setType(OntologyReferenceTypeEnum type) {
-		this.type = type;
-	}
+    @Column
+    private String URL;
+    @Column
+    private OntologyReferenceTypeEnum type;
+
+    public String getURL() {
+        return URL;
+    }
+
+    public void setURL(String uRL) {
+        URL = uRL;
+    }
+
+    public OntologyReferenceTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(OntologyReferenceTypeEnum type) {
+        this.type = type;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyReferenceHolder.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyReferenceHolder.java
index 158669ad..c6f6501c 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyReferenceHolder.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/OntologyReferenceHolder.java
@@ -3,9 +3,13 @@
 import java.util.List;
 
 public interface OntologyReferenceHolder {
-	public OntologyEntity getOntology() ;
-	public void setOntology(OntologyEntity ontology) ;
-	public List<OntologyReferenceEntity> getOntologyReference() ;
-	public void setOntologyReference(List<OntologyReferenceEntity> ontologyReference) ;
-	public String getId();
+    public OntologyEntity getOntology();
+
+    public void setOntology(OntologyEntity ontology);
+
+    public List<OntologyReferenceEntity> getOntologyReference();
+
+    public void setOntologyReference(List<OntologyReferenceEntity> ontologyReference);
+
+    public String getId();
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ScaleEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ScaleEntity.java
index d9d85439..4123b297 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ScaleEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ScaleEntity.java
@@ -1,131 +1,123 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import io.swagger.model.pheno.TraitDataType;
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
-import io.swagger.model.pheno.TraitDataType;
+import java.util.List;
 
 @Entity
 @Table(name = "scale")
 public class ScaleEntity extends BrAPIPrimaryEntity implements OntologyReferenceHolder {
-	@Column
-	private String scaleName;
-	@Column
-	private String scalePUI;
-	@Column
-	private TraitDataType dataType;
-	@Column
-	private Integer decimalPlaces;
-	@Column
-	private String units;
-	@Column
-	private String validValueMin;
-	@Column
-	private String validValueMax;
-	@OneToMany(mappedBy = "scale", cascade = CascadeType.ALL)
-	private List<ScaleValidValueCategoryEntity> validValueCategories;
-	@OneToMany(mappedBy = "scale", cascade = CascadeType.DETACH)
-	private List<VariableBaseEntity> variables;
-	@OneToOne
-	private OntologyEntity ontology;
-	@JoinTable
-	@OneToMany(cascade = CascadeType.ALL)
-	private List<OntologyReferenceEntity> ontologyReference;
-
-	public String getUnits() {
-		return units;
-	}
-
-	public void setUnits(String units) {
-		this.units = units;
-	}
-
-	public String getScalePUI() {
-		return scalePUI;
-	}
-
-	public void setScalePUI(String scalePUI) {
-		this.scalePUI = scalePUI;
-	}
-
-	public String getValidValueMin() {
-		return validValueMin;
-	}
-
-	public void setValidValueMin(String validValueMin) {
-		this.validValueMin = validValueMin;
-	}
-
-	public String getValidValueMax() {
-		return validValueMax;
-	}
-
-	public void setValidValueMax(String validValueMax) {
-		this.validValueMax = validValueMax;
-	}
-
-	public List<ScaleValidValueCategoryEntity> getValidValueCategories() {
-		return validValueCategories;
-	}
-
-	public void setValidValueCategories(List<ScaleValidValueCategoryEntity> validValueCategories) {
-		this.validValueCategories = validValueCategories;
-	}
-
-	public OntologyEntity getOntology() {
-		return ontology;
-	}
-
-	public void setOntology(OntologyEntity ontology) {
-		this.ontology = ontology;
-	}
-
-	public List<OntologyReferenceEntity> getOntologyReference() {
-		return ontologyReference;
-	}
-
-	public void setOntologyReference(List<OntologyReferenceEntity> ontologyReference) {
-		this.ontologyReference = ontologyReference;
-	}
-
-	public List<VariableBaseEntity> getVariables() {
-		return variables;
-	}
-
-	public void setVariables(List<VariableBaseEntity> variables) {
-		this.variables = variables;
-	}
-
-	public TraitDataType getDataType() {
-		return dataType;
-	}
-
-	public void setDataType(TraitDataType dataType) {
-		this.dataType = dataType;
-	}
-
-	public Integer getDecimalPlaces() {
-		return decimalPlaces;
-	}
-
-	public void setDecimalPlaces(Integer decimalPlaces) {
-		this.decimalPlaces = decimalPlaces;
-	}
-
-	public String getScaleName() {
-		return scaleName;
-	}
-
-	public void setScaleName(String scaleName) {
-		this.scaleName = scaleName;
-	}
+    @Column
+    private String scaleName;
+    @Column
+    private String scalePUI;
+    @Column
+    private TraitDataType dataType;
+    @Column
+    private Integer decimalPlaces;
+    @Column
+    private String units;
+    @Column
+    private String validValueMin;
+    @Column
+    private String validValueMax;
+    @OneToMany(mappedBy = "scale", cascade = CascadeType.ALL)
+    private List<ScaleValidValueCategoryEntity> validValueCategories;
+    @OneToMany(mappedBy = "scale", cascade = CascadeType.DETACH)
+    private List<VariableBaseEntity> variables;
+    @OneToOne
+    private OntologyEntity ontology;
+    @JoinTable
+    @OneToMany(cascade = CascadeType.ALL)
+    private List<OntologyReferenceEntity> ontologyReference;
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
+
+    public String getScalePUI() {
+        return scalePUI;
+    }
+
+    public void setScalePUI(String scalePUI) {
+        this.scalePUI = scalePUI;
+    }
+
+    public String getValidValueMin() {
+        return validValueMin;
+    }
+
+    public void setValidValueMin(String validValueMin) {
+        this.validValueMin = validValueMin;
+    }
+
+    public String getValidValueMax() {
+        return validValueMax;
+    }
+
+    public void setValidValueMax(String validValueMax) {
+        this.validValueMax = validValueMax;
+    }
+
+    public List<ScaleValidValueCategoryEntity> getValidValueCategories() {
+        return validValueCategories;
+    }
+
+    public void setValidValueCategories(List<ScaleValidValueCategoryEntity> validValueCategories) {
+        this.validValueCategories = validValueCategories;
+    }
+
+    public OntologyEntity getOntology() {
+        return ontology;
+    }
+
+    public void setOntology(OntologyEntity ontology) {
+        this.ontology = ontology;
+    }
+
+    public List<OntologyReferenceEntity> getOntologyReference() {
+        return ontologyReference;
+    }
+
+    public void setOntologyReference(List<OntologyReferenceEntity> ontologyReference) {
+        this.ontologyReference = ontologyReference;
+    }
+
+    public List<VariableBaseEntity> getVariables() {
+        return variables;
+    }
+
+    public void setVariables(List<VariableBaseEntity> variables) {
+        this.variables = variables;
+    }
+
+    public TraitDataType getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(TraitDataType dataType) {
+        this.dataType = dataType;
+    }
+
+    public Integer getDecimalPlaces() {
+        return decimalPlaces;
+    }
+
+    public void setDecimalPlaces(Integer decimalPlaces) {
+        this.decimalPlaces = decimalPlaces;
+    }
+
+    public String getScaleName() {
+        return scaleName;
+    }
+
+    public void setScaleName(String scaleName) {
+        this.scaleName = scaleName;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ScaleValidValueCategoryEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ScaleValidValueCategoryEntity.java
index d8eccbdd..e94fe44d 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ScaleValidValueCategoryEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ScaleValidValueCategoryEntity.java
@@ -1,38 +1,42 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
-@Table(name="scale_valid_value_category")
-public class ScaleValidValueCategoryEntity extends BrAPIBaseEntity{
-	@ManyToOne
-	private ScaleEntity scale;
-	@Column
-	private String label;
-	@Column
-	private String value;
-
-	public ScaleEntity getScale() {
-		return scale;
-	}
-	public void setScale(ScaleEntity scale) {
-		this.scale = scale;
-	}
-	public String getLabel() {
-		return label;
-	}
-	public void setLabel(String label) {
-		this.label = label;
-	}
-	public String getValue() {
-		return value;
-	}
-	public void setValue(String value) {
-		this.value = value;
-	}
+@Table(name = "scale_valid_value_category")
+public class ScaleValidValueCategoryEntity extends BrAPIBaseEntity {
+    @ManyToOne
+    private ScaleEntity scale;
+    @Column
+    private String label;
+    @Column
+    private String value;
+
+    public ScaleEntity getScale() {
+        return scale;
+    }
+
+    public void setScale(ScaleEntity scale) {
+        this.scale = scale;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TaxonEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TaxonEntity.java
index 838cbb83..e70a6e54 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TaxonEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TaxonEntity.java
@@ -1,39 +1,43 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 import org.brapi.test.BrAPITestServer.model.entity.germ.GermplasmEntity;
 
 @Entity
-@Table(name="germplasm_taxon")
+@Table(name = "germplasm_taxon")
 public class TaxonEntity extends BrAPIBaseEntity {
-	@Column
-	private String sourceName;
-	@Column
-	private String taxonId;
-	@ManyToOne
-	private GermplasmEntity germplasm;
-	
-	public GermplasmEntity getGermplasm() {
-		return germplasm;
-	}
-	public void setGermplasm(GermplasmEntity germplasm) {
-		this.germplasm = germplasm;
-	}
-	public String getSourceName() {
-		return sourceName;
-	}
-	public void setSourceName(String sourceName) {
-		this.sourceName = sourceName;
-	}
-	public String getTaxonId() {
-		return taxonId;
-	}
-	public void setTaxonId(String taxonId) {
-		this.taxonId = taxonId;
-	}	
+    @Column
+    private String sourceName;
+    @Column
+    private String taxonId;
+    @ManyToOne
+    private GermplasmEntity germplasm;
+
+    public GermplasmEntity getGermplasm() {
+        return germplasm;
+    }
+
+    public void setGermplasm(GermplasmEntity germplasm) {
+        this.germplasm = germplasm;
+    }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
+
+    public String getTaxonId() {
+        return taxonId;
+    }
+
+    public void setTaxonId(String taxonId) {
+        this.taxonId = taxonId;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitAbbreviationEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitAbbreviationEntity.java
index 3512dc7d..b6521cae 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitAbbreviationEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitAbbreviationEntity.java
@@ -1,32 +1,34 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
-@Table(name="trait_abbreviation")
-public class TraitAbbreviationEntity extends BrAPIBaseEntity{
-	@ManyToOne
-	private TraitEntity trait;
-	@Column
-	private String abbreviation;
-	
-	public TraitEntity getTrait() {
-		return trait;
-	}
-	public void setTrait(TraitEntity trait) {
-		this.trait = trait;
-	}
-	public String getAbbreviation() {
-		return abbreviation;
-	}
-	public void setAbbreviation(String abbreviation) {
-		this.abbreviation = abbreviation;
-	}
-	
-	
+@Table(name = "trait_abbreviation")
+public class TraitAbbreviationEntity extends BrAPIBaseEntity {
+    @ManyToOne
+    private TraitEntity trait;
+    @Column
+    private String abbreviation;
+
+    public TraitEntity getTrait() {
+        return trait;
+    }
+
+    public void setTrait(TraitEntity trait) {
+        this.trait = trait;
+    }
+
+    public String getAbbreviation() {
+        return abbreviation;
+    }
+
+    public void setAbbreviation(String abbreviation) {
+        this.abbreviation = abbreviation;
+    }
+
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitEntity.java
index 84fbb8c4..d0262532 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitEntity.java
@@ -1,141 +1,162 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 
+import java.util.List;
+
 @Entity
 @Table(name = "trait")
-public class TraitEntity extends BrAPIPrimaryEntity implements OntologyReferenceHolder{
-	@ElementCollection
-	private List<String> alternativeAbbreviations;
-	@Column
-	private String attribute;
-	@Column
-	private String attributePUI;
-	@Column
-	private String entity;
-	@Column
-	private String entityPUI;
-	@Column
-	private String mainAbbreviation;
-	@OneToOne
-	private OntologyEntity ontology;
-	@JoinTable
-	@OneToMany(cascade = CascadeType.ALL)
-	private List<OntologyReferenceEntity> ontologyReference;
-	@Column
-	private String status;
-	@ElementCollection
-	private List<String> synonyms;
-	@Column
-	private String traitClass;
-	@Column
-	private String traitDescription;
-	@Column
-	private String traitName;
-	@Column
-	private String traitPUI;
-	@OneToMany(mappedBy = "trait")
-	private List<VariableBaseEntity> variables;
-	
-	public String getAttributePUI() {
-		return attributePUI;
-	}
-	public void setAttributePUI(String attributePUI) {
-		this.attributePUI = attributePUI;
-	}
-	public String getEntityPUI() {
-		return entityPUI;
-	}
-	public void setEntityPUI(String entityPUI) {
-		this.entityPUI = entityPUI;
-	}
-	public String getTraitPUI() {
-		return traitPUI;
-	}
-	public void setTraitPUI(String traitPUI) {
-		this.traitPUI = traitPUI;
-	}
-	public List<String> getAlternativeAbbreviations() {
-		return alternativeAbbreviations;
-	}
-	public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-		this.alternativeAbbreviations = alternativeAbbreviations;
-	}
-	public String getAttribute() {
-		return attribute;
-	}
-	public void setAttribute(String attribute) {
-		this.attribute = attribute;
-	}
-	public String getEntity() {
-		return entity;
-	}
-	public void setEntity(String entity) {
-		this.entity = entity;
-	}
-	public String getMainAbbreviation() {
-		return mainAbbreviation;
-	}
-	public void setMainAbbreviation(String mainAbbreviation) {
-		this.mainAbbreviation = mainAbbreviation;
-	}
-	public OntologyEntity getOntology() {
-		return ontology;
-	}
-	public void setOntology(OntologyEntity ontology) {
-		this.ontology = ontology;
-	}
-	public List<OntologyReferenceEntity> getOntologyReference() {
-		return ontologyReference;
-	}
-	public void setOntologyReference(List<OntologyReferenceEntity> ontologyReference) {
-		this.ontologyReference = ontologyReference;
-	}
-	public String getStatus() {
-		return status;
-	}
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	public List<String> getSynonyms() {
-		return synonyms;
-	}
-	public void setSynonyms(List<String> synonyms) {
-		this.synonyms = synonyms;
-	}
-	public String getTraitClass() {
-		return traitClass;
-	}
-	public void setTraitClass(String traitClass) {
-		this.traitClass = traitClass;
-	}
-	public String getTraitDescription() {
-		return traitDescription;
-	}
-	public void setTraitDescription(String traitDescription) {
-		this.traitDescription = traitDescription;
-	}
-	public String getTraitName() {
-		return traitName;
-	}
-	public void setTraitName(String traitName) {
-		this.traitName = traitName;
-	}
-	public List<VariableBaseEntity> getVariables() {
-		return variables;
-	}
-	public void setVariables(List<VariableBaseEntity> variables) {
-		this.variables = variables;
-	}
+public class TraitEntity extends BrAPIPrimaryEntity implements OntologyReferenceHolder {
+    @ElementCollection
+    private List<String> alternativeAbbreviations;
+    @Column
+    private String attribute;
+    @Column
+    private String attributePUI;
+    @Column
+    private String entity;
+    @Column
+    private String entityPUI;
+    @Column
+    private String mainAbbreviation;
+    @OneToOne
+    private OntologyEntity ontology;
+    @JoinTable
+    @OneToMany(cascade = CascadeType.ALL)
+    private List<OntologyReferenceEntity> ontologyReference;
+    @Column
+    private String status;
+    @ElementCollection
+    private List<String> synonyms;
+    @Column
+    private String traitClass;
+    @Column
+    private String traitDescription;
+    @Column
+    private String traitName;
+    @Column
+    private String traitPUI;
+    @OneToMany(mappedBy = "trait")
+    private List<VariableBaseEntity> variables;
+
+    public String getAttributePUI() {
+        return attributePUI;
+    }
+
+    public void setAttributePUI(String attributePUI) {
+        this.attributePUI = attributePUI;
+    }
+
+    public String getEntityPUI() {
+        return entityPUI;
+    }
+
+    public void setEntityPUI(String entityPUI) {
+        this.entityPUI = entityPUI;
+    }
+
+    public String getTraitPUI() {
+        return traitPUI;
+    }
+
+    public void setTraitPUI(String traitPUI) {
+        this.traitPUI = traitPUI;
+    }
+
+    public List<String> getAlternativeAbbreviations() {
+        return alternativeAbbreviations;
+    }
+
+    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
+        this.alternativeAbbreviations = alternativeAbbreviations;
+    }
+
+    public String getAttribute() {
+        return attribute;
+    }
+
+    public void setAttribute(String attribute) {
+        this.attribute = attribute;
+    }
+
+    public String getEntity() {
+        return entity;
+    }
+
+    public void setEntity(String entity) {
+        this.entity = entity;
+    }
+
+    public String getMainAbbreviation() {
+        return mainAbbreviation;
+    }
+
+    public void setMainAbbreviation(String mainAbbreviation) {
+        this.mainAbbreviation = mainAbbreviation;
+    }
+
+    public OntologyEntity getOntology() {
+        return ontology;
+    }
+
+    public void setOntology(OntologyEntity ontology) {
+        this.ontology = ontology;
+    }
+
+    public List<OntologyReferenceEntity> getOntologyReference() {
+        return ontologyReference;
+    }
+
+    public void setOntologyReference(List<OntologyReferenceEntity> ontologyReference) {
+        this.ontologyReference = ontologyReference;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public List<String> getSynonyms() {
+        return synonyms;
+    }
+
+    public void setSynonyms(List<String> synonyms) {
+        this.synonyms = synonyms;
+    }
+
+    public String getTraitClass() {
+        return traitClass;
+    }
+
+    public void setTraitClass(String traitClass) {
+        this.traitClass = traitClass;
+    }
+
+    public String getTraitDescription() {
+        return traitDescription;
+    }
+
+    public void setTraitDescription(String traitDescription) {
+        this.traitDescription = traitDescription;
+    }
+
+    public String getTraitName() {
+        return traitName;
+    }
+
+    public void setTraitName(String traitName) {
+        this.traitName = traitName;
+    }
+
+    public List<VariableBaseEntity> getVariables() {
+        return variables;
+    }
+
+    public void setVariables(List<VariableBaseEntity> variables) {
+        this.variables = variables;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitSynonymEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitSynonymEntity.java
index 8f1218aa..96d00753 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitSynonymEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TraitSynonymEntity.java
@@ -1,31 +1,33 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
-@Table(name="trait_synonym")
-public class TraitSynonymEntity extends BrAPIBaseEntity{
-	@ManyToOne
-	private TraitEntity trait;
-	@Column
-	private String synonym;
-	
-	public TraitEntity getTrait() {
-		return trait;
-	}
-	public void setTrait(TraitEntity trait) {
-		this.trait = trait;
-	}
-	public String getSynonym() {
-		return synonym;
-	}
-	public void setSynonym(String synonym) {
-		this.synonym = synonym;
-	}
-	
+@Table(name = "trait_synonym")
+public class TraitSynonymEntity extends BrAPIBaseEntity {
+    @ManyToOne
+    private TraitEntity trait;
+    @Column
+    private String synonym;
+
+    public TraitEntity getTrait() {
+        return trait;
+    }
+
+    public void setTrait(TraitEntity trait) {
+        this.trait = trait;
+    }
+
+    public String getSynonym() {
+        return synonym;
+    }
+
+    public void setSynonym(String synonym) {
+        this.synonym = synonym;
+    }
+
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TreatmentEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TreatmentEntity.java
index eeac05a5..d1080793 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TreatmentEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/TreatmentEntity.java
@@ -1,38 +1,42 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
 
 @Entity
-@Table(name="observation_unit_treatment")
-public class TreatmentEntity extends BrAPIBaseEntity{
-	@ManyToOne
-	private ObservationUnitEntity observationUnit;
-	@Column
-	private String factor;
-	@Column
-	private String modality;
-	
-	public String getFactor() {
-		return factor;
-	}
-	public void setFactor(String factor) {
-		this.factor = factor;
-	}
-	public String getModality() {
-		return modality;
-	}
-	public void setModality(String modality) {
-		this.modality = modality;
-	}
-	public ObservationUnitEntity getObservationUnit() {
-		return observationUnit;
-	}
-	public void setObservationUnit(ObservationUnitEntity observationUnit) {
-		this.observationUnit = observationUnit;
-	}
+@Table(name = "observation_unit_treatment")
+public class TreatmentEntity extends BrAPIBaseEntity {
+    @ManyToOne
+    private ObservationUnitEntity observationUnit;
+    @Column
+    private String factor;
+    @Column
+    private String modality;
+
+    public String getFactor() {
+        return factor;
+    }
+
+    public void setFactor(String factor) {
+        this.factor = factor;
+    }
+
+    public String getModality() {
+        return modality;
+    }
+
+    public void setModality(String modality) {
+        this.modality = modality;
+    }
+
+    public ObservationUnitEntity getObservationUnit() {
+        return observationUnit;
+    }
+
+    public void setObservationUnit(ObservationUnitEntity observationUnit) {
+        this.observationUnit = observationUnit;
+    }
 }
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/VariableBaseEntity.java b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/VariableBaseEntity.java
index 01b4f3af..7ccfc7d1 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/VariableBaseEntity.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/VariableBaseEntity.java
@@ -1,153 +1,175 @@
 package org.brapi.test.BrAPITestServer.model.entity.pheno;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-
+import jakarta.persistence.*;
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.CropEntity;
 
+import java.util.Date;
+import java.util.List;
+
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 public class VariableBaseEntity extends BrAPIPrimaryEntity implements OntologyReferenceHolder {
 
-	@ManyToOne
-	private CropEntity crop;
-	@ElementCollection
-	private List<String> contextOfUse;
-	@Column
-	private String defaultValue;
-	@Column
-	private String documentationURL;
-	@Column
-	private String growthStage;
-	@Column
-	private String institution;
-	@Column
-	private String language;
-	@ManyToOne
-	private MethodEntity method;
-	@ManyToOne
-	private OntologyEntity ontology;
-	@ManyToOne
-	private ScaleEntity scale;
-	@Column
-	private String scientist;
-	@Column
-	private String status;
-	@Column
-	private Date submissionTimestamp;
-	@ElementCollection
-	private List<String> synonyms;
-	@ManyToOne
-	private TraitEntity trait;
-	@JoinTable
-	@OneToMany(cascade = CascadeType.ALL)
-	private List<OntologyReferenceEntity> ontologyReference;
-	
-	public List<OntologyReferenceEntity> getOntologyReference() {
-		return ontologyReference;
-	}
-	public void setOntologyReference(List<OntologyReferenceEntity> ontologyReference) {
-		this.ontologyReference = ontologyReference;
-	}
-	public CropEntity getCrop() {
-		return crop;
-	}
-	public void setCrop(CropEntity crop) {
-		this.crop = crop;
-	}
-	public List<String> getContextOfUse() {
-		return contextOfUse;
-	}
-	public void setContextOfUse(List<String> contextOfUse) {
-		this.contextOfUse = contextOfUse;
-	}
-	public String getDefaultValue() {
-		return defaultValue;
-	}
-	public void setDefaultValue(String defaultValue) {
-		this.defaultValue = defaultValue;
-	}
-	public String getDocumentationURL() {
-		return documentationURL;
-	}
-	public void setDocumentationURL(String documentationURL) {
-		this.documentationURL = documentationURL;
-	}
-	public String getGrowthStage() {
-		return growthStage;
-	}
-	public void setGrowthStage(String growthStage) {
-		this.growthStage = growthStage;
-	}
-	public String getInstitution() {
-		return institution;
-	}
-	public void setInstitution(String institution) {
-		this.institution = institution;
-	}
-	public String getLanguage() {
-		return language;
-	}
-	public void setLanguage(String language) {
-		this.language = language;
-	}
-	public MethodEntity getMethod() {
-		return method;
-	}
-	public void setMethod(MethodEntity method) {
-		this.method = method;
-	}
-	public OntologyEntity getOntology() {
-		return ontology;
-	}
-	public void setOntology(OntologyEntity ontology) {
-		this.ontology = ontology;
-	}
-	public ScaleEntity getScale() {
-		return scale;
-	}
-	public void setScale(ScaleEntity scale) {
-		this.scale = scale;
-	}
-	public String getScientist() {
-		return scientist;
-	}
-	public void setScientist(String scientist) {
-		this.scientist = scientist;
-	}
-	public String getStatus() {
-		return status;
-	}
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	public Date getSubmissionTimestamp() {
-		return submissionTimestamp;
-	}
-	public void setSubmissionTimestamp(Date submissionTimestamp) {
-		this.submissionTimestamp = submissionTimestamp;
-	}
-	public List<String> getSynonyms() {
-		return synonyms;
-	}
-	public void setSynonyms(List<String> synonyms) {
-		this.synonyms = synonyms;
-	}
-	public TraitEntity getTrait() {
-		return trait;
-	}
-	public void setTrait(TraitEntity trait) {
-		this.trait = trait;
-	}
+    @ManyToOne
+    private CropEntity crop;
+    @ElementCollection
+    private List<String> contextOfUse;
+    @Column
+    private String defaultValue;
+    @Column
+    private String documentationURL;
+    @Column
+    private String growthStage;
+    @Column
+    private String institution;
+    @Column
+    private String language;
+    @ManyToOne
+    private MethodEntity method;
+    @ManyToOne
+    private OntologyEntity ontology;
+    @ManyToOne
+    private ScaleEntity scale;
+    @Column
+    private String scientist;
+    @Column
+    private String status;
+    @Column
+    private Date submissionTimestamp;
+    @ElementCollection
+    private List<String> synonyms;
+    @ManyToOne
+    private TraitEntity trait;
+    @JoinTable
+    @OneToMany(cascade = CascadeType.ALL)
+    private List<OntologyReferenceEntity> ontologyReference;
+
+    public List<OntologyReferenceEntity> getOntologyReference() {
+        return ontologyReference;
+    }
+
+    public void setOntologyReference(List<OntologyReferenceEntity> ontologyReference) {
+        this.ontologyReference = ontologyReference;
+    }
+
+    public CropEntity getCrop() {
+        return crop;
+    }
+
+    public void setCrop(CropEntity crop) {
+        this.crop = crop;
+    }
+
+    public List<String> getContextOfUse() {
+        return contextOfUse;
+    }
+
+    public void setContextOfUse(List<String> contextOfUse) {
+        this.contextOfUse = contextOfUse;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getDocumentationURL() {
+        return documentationURL;
+    }
+
+    public void setDocumentationURL(String documentationURL) {
+        this.documentationURL = documentationURL;
+    }
+
+    public String getGrowthStage() {
+        return growthStage;
+    }
+
+    public void setGrowthStage(String growthStage) {
+        this.growthStage = growthStage;
+    }
+
+    public String getInstitution() {
+        return institution;
+    }
+
+    public void setInstitution(String institution) {
+        this.institution = institution;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public MethodEntity getMethod() {
+        return method;
+    }
+
+    public void setMethod(MethodEntity method) {
+        this.method = method;
+    }
+
+    public OntologyEntity getOntology() {
+        return ontology;
+    }
+
+    public void setOntology(OntologyEntity ontology) {
+        this.ontology = ontology;
+    }
+
+    public ScaleEntity getScale() {
+        return scale;
+    }
+
+    public void setScale(ScaleEntity scale) {
+        this.scale = scale;
+    }
+
+    public String getScientist() {
+        return scientist;
+    }
+
+    public void setScientist(String scientist) {
+        this.scientist = scientist;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Date getSubmissionTimestamp() {
+        return submissionTimestamp;
+    }
+
+    public void setSubmissionTimestamp(Date submissionTimestamp) {
+        this.submissionTimestamp = submissionTimestamp;
+    }
+
+    public List<String> getSynonyms() {
+        return synonyms;
+    }
+
+    public void setSynonyms(List<String> synonyms) {
+        this.synonyms = synonyms;
+    }
+
+    public TraitEntity getTrait() {
+        return trait;
+    }
+
+    public void setTrait(TraitEntity trait) {
+        this.trait = trait;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/repository/BrAPIRepositoryImpl.java b/src/main/java/org/brapi/test/BrAPITestServer/repository/BrAPIRepositoryImpl.java
index a869303c..f5f1d384 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/repository/BrAPIRepositoryImpl.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/repository/BrAPIRepositoryImpl.java
@@ -8,8 +8,8 @@
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
 
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.service.SearchQueryBuilder;
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/repository/core/TrialRepository.java b/src/main/java/org/brapi/test/BrAPITestServer/repository/core/TrialRepository.java
index e3c4bbbe..b9ed27c2 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/repository/core/TrialRepository.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/repository/core/TrialRepository.java
@@ -12,7 +12,7 @@ public interface TrialRepository extends BrAPIRepository<TrialEntity, String> {
 	@Query("select t from TrialEntity t join t.studies s "
 			+ "where ('' = :programDbId OR t.program.id = :programDbId) "
 			+ "AND ('' = :commonCropName OR t.program.crop.cropName = :commonCropName) "
-			+ "AND ('' = :locationDbId OR :locationDbId IN s.location.id) "
+			+ "AND ('' = :locationDbId OR :locationDbId = s.location.id) "
 			+ "AND (:applyActiveFilter = false OR :active = t.active)")
 	Page<TrialEntity> findBySearch(
 			@Param("commonCropName") String commonCropName,
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/repository/germ/GermplasmRepositoryImpl.java b/src/main/java/org/brapi/test/BrAPITestServer/repository/germ/GermplasmRepositoryImpl.java
index bdc7b5a9..d0b9475e 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/repository/germ/GermplasmRepositoryImpl.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/repository/germ/GermplasmRepositoryImpl.java
@@ -2,8 +2,8 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import org.brapi.test.BrAPITestServer.model.entity.germ.GermplasmEntity;
 import org.brapi.test.BrAPITestServer.service.CustomRepositorySearchService;
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/repository/germ/PedigreeRepositoryCustomImpl.java b/src/main/java/org/brapi/test/BrAPITestServer/repository/germ/PedigreeRepositoryCustomImpl.java
index ad7c9a81..2e206b2c 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/repository/germ/PedigreeRepositoryCustomImpl.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/repository/germ/PedigreeRepositoryCustomImpl.java
@@ -2,9 +2,9 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 
 import org.brapi.test.BrAPITestServer.model.entity.germ.PedigreeNodeEntity;
 
diff --git a/src/main/java/org/brapi/test/BrAPITestServer/service/CustomRepositorySearchService.java b/src/main/java/org/brapi/test/BrAPITestServer/service/CustomRepositorySearchService.java
index b7e47ab9..c6143d86 100644
--- a/src/main/java/org/brapi/test/BrAPITestServer/service/CustomRepositorySearchService.java
+++ b/src/main/java/org/brapi/test/BrAPITestServer/service/CustomRepositorySearchService.java
@@ -4,8 +4,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
diff --git a/src/main/resources/db/migration/V001__initial_schema.sql b/src/main/resources/db/migration/V001__initial_schema.sql
index 698b4d2f..4af27682 100644
--- a/src/main/resources/db/migration/V001__initial_schema.sql
+++ b/src/main/resources/db/migration/V001__initial_schema.sql
@@ -14,8 +14,8 @@
 --
 
 CREATE TABLE additional_info (
-    id text NOT NULL,
-    key text,
+    id varchar(255) NOT NULL,
+    key varchar(255),
     value bytea
 );
 
@@ -41,14 +41,14 @@ CREATE TABLE allele (
 --
 
 CREATE TABLE allele_call (
-    id text NOT NULL,
-    auth_user_id text,
-    genotype text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    genotype varchar(255),
     genotype_likelihood double precision,
-    phase_set text,
+    phase_set varchar(255),
     read_depth integer,
-    call_set_id text,
-    variant_id text
+    call_set_id varchar(255),
+    variant_id varchar(255)
 );
 
 
@@ -58,8 +58,8 @@ CREATE TABLE allele_call (
 --
 
 CREATE TABLE allele_call_additional_info (
-    call_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    call_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -69,8 +69,8 @@ CREATE TABLE allele_call_additional_info (
 --
 
 CREATE TABLE allele_call_external_references (
-    call_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    call_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -94,11 +94,11 @@ CREATE TABLE allele_matrix (
 --
 
 CREATE TABLE breeding_method (
-    id text NOT NULL,
-    auth_user_id text,
-    abbreviation text,
-    description text,
-    name text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    abbreviation varchar(255),
+    description varchar(255),
+    name varchar(255)
 );
 
 
@@ -108,8 +108,8 @@ CREATE TABLE breeding_method (
 --
 
 CREATE TABLE breeding_method_additional_info (
-    breeding_method_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    breeding_method_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -119,8 +119,8 @@ CREATE TABLE breeding_method_additional_info (
 --
 
 CREATE TABLE breeding_method_external_references (
-    breeding_method_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    breeding_method_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -130,12 +130,12 @@ CREATE TABLE breeding_method_external_references (
 --
 
 CREATE TABLE callset (
-    id text NOT NULL,
-    auth_user_id text,
-    call_set_name text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    call_set_name varchar(255),
     created timestamp without time zone,
     updated timestamp without time zone,
-    sample_id text
+    sample_id varchar(255)
 );
 
 
@@ -145,8 +145,8 @@ CREATE TABLE callset (
 --
 
 CREATE TABLE callset_additional_info (
-    call_set_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    call_set_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -156,8 +156,8 @@ CREATE TABLE callset_additional_info (
 --
 
 CREATE TABLE callset_external_references (
-    call_set_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    call_set_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -167,8 +167,8 @@ CREATE TABLE callset_external_references (
 --
 
 CREATE TABLE callset_variant_sets (
-    call_sets_id text NOT NULL,
-    variant_sets_id text NOT NULL
+    call_sets_id varchar(255) NOT NULL,
+    variant_sets_id varchar(255) NOT NULL
 );
 
 
@@ -178,14 +178,14 @@ CREATE TABLE callset_variant_sets (
 --
 
 CREATE TABLE contact (
-    id text NOT NULL,
-    email text,
-    institute_name text,
-    name text,
-    orcid text,
-    study_db_id text,
-    trial_db_id text,
-    type text
+    id varchar(255) NOT NULL,
+    email varchar(255),
+    institute_name varchar(255),
+    name varchar(255),
+    orcid varchar(255),
+    study_db_id varchar(255),
+    trial_db_id varchar(255),
+    type varchar(255)
 );
 
 
@@ -195,11 +195,11 @@ CREATE TABLE contact (
 --
 
 CREATE TABLE coordinate (
-    id text NOT NULL,
+    id varchar(255) NOT NULL,
     altitude numeric(9,6),
     latitude numeric(9,6),
     longitude numeric(9,6),
-    geojson_id text
+    geojson_id varchar(255)
 );
 
 
@@ -209,9 +209,9 @@ CREATE TABLE coordinate (
 --
 
 CREATE TABLE crop (
-    id text NOT NULL,
-    auth_user_id text,
-    crop_name text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    crop_name varchar(255)
 );
 
 
@@ -221,8 +221,8 @@ CREATE TABLE crop (
 --
 
 CREATE TABLE crop_additional_info (
-    crop_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    crop_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -232,8 +232,8 @@ CREATE TABLE crop_additional_info (
 --
 
 CREATE TABLE crop_external_references (
-    crop_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    crop_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -243,14 +243,14 @@ CREATE TABLE crop_external_references (
 --
 
 CREATE TABLE cross_entity (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     cross_type integer,
-    name text,
+    name varchar(255),
     planned boolean,
     status integer,
-    crossing_project_id text,
-    planned_cross_id text
+    crossing_project_id varchar(255),
+    planned_cross_id varchar(255)
 );
 
 
@@ -260,8 +260,8 @@ CREATE TABLE cross_entity (
 --
 
 CREATE TABLE cross_entity_additional_info (
-    cross_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    cross_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -271,8 +271,8 @@ CREATE TABLE cross_entity_additional_info (
 --
 
 CREATE TABLE cross_entity_cross_attributes (
-    cross_entity_id text NOT NULL,
-    cross_attributes text
+    cross_entity_id varchar(255) NOT NULL,
+    cross_attributes varchar(255)
 );
 
 
@@ -282,8 +282,8 @@ CREATE TABLE cross_entity_cross_attributes (
 --
 
 CREATE TABLE cross_entity_external_references (
-    cross_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    cross_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -293,12 +293,12 @@ CREATE TABLE cross_entity_external_references (
 --
 
 CREATE TABLE cross_parent (
-    id text NOT NULL,
+    id varchar(255) NOT NULL,
     parent_type integer,
-    cross_id text,
-    crossing_project_id text,
-    germplasm_id text,
-    observation_unit_id text
+    cross_id varchar(255),
+    crossing_project_id varchar(255),
+    germplasm_id varchar(255),
+    observation_unit_id varchar(255)
 );
 
 
@@ -308,11 +308,11 @@ CREATE TABLE cross_parent (
 --
 
 CREATE TABLE cross_pollination_event (
-    id text NOT NULL,
-    pollination_number text,
+    id varchar(255) NOT NULL,
+    pollination_number varchar(255),
     pollination_successful boolean,
     pollination_time_stamp timestamp without time zone,
-    cross_id text
+    cross_id varchar(255)
 );
 
 
@@ -322,11 +322,11 @@ CREATE TABLE cross_pollination_event (
 --
 
 CREATE TABLE crossing_project (
-    id text NOT NULL,
-    auth_user_id text,
-    description text,
-    name text,
-    program_id text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    description varchar(255),
+    name varchar(255),
+    program_id varchar(255)
 );
 
 
@@ -336,8 +336,8 @@ CREATE TABLE crossing_project (
 --
 
 CREATE TABLE crossing_project_additional_info (
-    crossing_project_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    crossing_project_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -347,8 +347,8 @@ CREATE TABLE crossing_project_additional_info (
 --
 
 CREATE TABLE crossing_project_external_references (
-    crossing_project_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    crossing_project_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -386,12 +386,12 @@ CREATE TABLE donor (
 --
 
 CREATE TABLE event (
-    id text NOT NULL,
-    auth_user_id text,
-    event_description text,
-    event_type text,
-    event_type_db_id text,
-    study_id text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    event_description varchar(255),
+    event_type varchar(255),
+    event_type_db_id varchar(255),
+    study_id varchar(255)
 );
 
 
@@ -401,8 +401,8 @@ CREATE TABLE event (
 --
 
 CREATE TABLE event_additional_info (
-    event_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    event_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -412,7 +412,7 @@ CREATE TABLE event_additional_info (
 --
 
 CREATE TABLE event_entity_dates (
-    event_entity_id text NOT NULL,
+    event_entity_id varchar(255) NOT NULL,
     dates timestamp without time zone
 );
 
@@ -423,8 +423,8 @@ CREATE TABLE event_entity_dates (
 --
 
 CREATE TABLE event_external_references (
-    event_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    event_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -434,8 +434,8 @@ CREATE TABLE event_external_references (
 --
 
 CREATE TABLE event_observation_units (
-    event_entity_id text NOT NULL,
-    observation_units_id text NOT NULL
+    event_entity_id varchar(255) NOT NULL,
+    observation_units_id varchar(255) NOT NULL
 );
 
 
@@ -445,16 +445,16 @@ CREATE TABLE event_observation_units (
 --
 
 CREATE TABLE event_param (
-    id text NOT NULL,
-    code text,
-    description text,
-    key text,
-    name text,
-    rdf_value text,
-    units text,
-    value text,
-    value_description text,
-    event_id text
+    id varchar(255) NOT NULL,
+    code varchar(255),
+    description varchar(255),
+    key varchar(255),
+    name varchar(255),
+    rdf_value varchar(255),
+    units varchar(255),
+    value varchar(255),
+    value_description varchar(255),
+    event_id varchar(255)
 );
 
 
@@ -464,8 +464,8 @@ CREATE TABLE event_param (
 --
 
 CREATE TABLE event_parameter_entity_values_by_date (
-    event_parameter_entity_id text NOT NULL,
-    values_by_date text
+    event_parameter_entity_id varchar(255) NOT NULL,
+    values_by_date varchar(255)
 );
 
 
@@ -475,9 +475,9 @@ CREATE TABLE event_parameter_entity_values_by_date (
 --
 
 CREATE TABLE external_reference (
-    id text NOT NULL,
-    external_reference_id text,
-    external_reference_source text
+    id varchar(255) NOT NULL,
+    external_reference_id varchar(255),
+    external_reference_source varchar(255)
 );
 
 
@@ -487,17 +487,17 @@ CREATE TABLE external_reference (
 --
 
 CREATE TABLE genome_map (
-    id text NOT NULL,
-    auth_user_id text,
-    comments text,
-    documentationurl text,
-    map_name text,
-    mappui text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    comments varchar(255),
+    documentationurl varchar(255),
+    map_name varchar(255),
+    mappui varchar(255),
     published_date timestamp without time zone,
-    scientific_name text,
-    type text,
-    unit text,
-    crop_id text
+    scientific_name varchar(255),
+    type varchar(255),
+    unit varchar(255),
+    crop_id varchar(255)
 );
 
 
@@ -507,8 +507,8 @@ CREATE TABLE genome_map (
 --
 
 CREATE TABLE genome_map_additional_info (
-    genome_map_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    genome_map_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -518,8 +518,8 @@ CREATE TABLE genome_map_additional_info (
 --
 
 CREATE TABLE genome_map_external_references (
-    genome_map_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    genome_map_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -529,8 +529,8 @@ CREATE TABLE genome_map_external_references (
 --
 
 CREATE TABLE genome_map_studies (
-    genome_map_entity_id text NOT NULL,
-    studies_id text NOT NULL
+    genome_map_entity_id varchar(255) NOT NULL,
+    studies_id varchar(255) NOT NULL
 );
 
 
@@ -540,8 +540,8 @@ CREATE TABLE genome_map_studies (
 --
 
 CREATE TABLE geojson (
-    id text NOT NULL,
-    type text
+    id varchar(255) NOT NULL,
+    type varchar(255)
 );
 
 
@@ -551,29 +551,29 @@ CREATE TABLE geojson (
 --
 
 CREATE TABLE germplasm (
-    id text NOT NULL,
-    auth_user_id text,
-    accession_number text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    accession_number varchar(255),
     acquisition_date timestamp without time zone,
     acquisition_source_code integer,
     biological_status_of_accession_code integer,
-    collection text,
-    country_of_origin_code text,
-    default_display_name text,
-    documentationurl text,
-    genus text,
-    germplasm_name text,
-    germplasmpui text,
-    germplasm_preprocessing text,
+    collection varchar(255),
+    country_of_origin_code varchar(255),
+    default_display_name varchar(255),
+    documentationurl varchar(255),
+    genus varchar(255),
+    germplasm_name varchar(255),
+    germplasmpui varchar(255),
+    germplasm_preprocessing varchar(255),
     mls_status integer,
-    seed_source text,
-    seed_source_description text,
-    species text,
-    species_authority text,
-    subtaxa text,
-    subtaxa_authority text,
-    breeding_method_id text,
-    crop_id text
+    seed_source varchar(255),
+    seed_source_description varchar(255),
+    species varchar(255),
+    species_authority varchar(255),
+    subtaxa varchar(255),
+    subtaxa_authority varchar(255),
+    breeding_method_id varchar(255),
+    crop_id varchar(255)
 );
 
 
@@ -583,8 +583,8 @@ CREATE TABLE germplasm (
 --
 
 CREATE TABLE germplasm_additional_info (
-    germplasm_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    germplasm_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -605,28 +605,28 @@ CREATE TABLE germplasm_attribute_category (
 --
 
 CREATE TABLE germplasm_attribute_definition (
-    id text NOT NULL,
-    auth_user_id text,
-    default_value text,
-    documentationurl text,
-    growth_stage text,
-    institution text,
-    language text,
-    scientist text,
-    status text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    default_value varchar(255),
+    documentationurl varchar(255),
+    growth_stage varchar(255),
+    institution varchar(255),
+    language varchar(255),
+    scientist varchar(255),
+    status varchar(255),
     submission_timestamp timestamp without time zone,
-    crop_id text,
-    method_id text,
-    ontology_id text,
-    scale_id text,
-    trait_id text,
-    attribute_category text,
-    code text,
-    datatype text,
-    description text,
-    name text,
-    pui text,
-    uri text
+    crop_id varchar(255),
+    method_id varchar(255),
+    ontology_id varchar(255),
+    scale_id varchar(255),
+    trait_id varchar(255),
+    attribute_category varchar(255),
+    code varchar(255),
+    datatype varchar(255),
+    description varchar(255),
+    name varchar(255),
+    pui varchar(255),
+    uri varchar(255)
 );
 
 
@@ -636,12 +636,12 @@ CREATE TABLE germplasm_attribute_definition (
 --
 
 CREATE TABLE germplasm_attribute_value (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     determined_date timestamp without time zone,
-    value text,
-    attribute_id text,
-    germplasm_id text
+    value varchar(255),
+    attribute_id varchar(255),
+    germplasm_id varchar(255)
 );
 
 
@@ -651,8 +651,8 @@ CREATE TABLE germplasm_attribute_value (
 --
 
 CREATE TABLE germplasm_attribute_value_additional_info (
-    germplasm_attribute_value_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    germplasm_attribute_value_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -662,8 +662,8 @@ CREATE TABLE germplasm_attribute_value_additional_info (
 --
 
 CREATE TABLE germplasm_attribute_value_external_references (
-    germplasm_attribute_value_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    germplasm_attribute_value_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -673,13 +673,13 @@ CREATE TABLE germplasm_attribute_value_external_references (
 --
 
 CREATE TABLE germplasm_donor (
-    id text NOT NULL,
-    auth_user_id text,
-    donor_accession_number text,
-    donor_institute_code text,
-    donor_institute_name text,
-    germplasmpui text,
-    germplasm_id text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    donor_accession_number varchar(255),
+    donor_institute_code varchar(255),
+    donor_institute_name varchar(255),
+    germplasmpui varchar(255),
+    germplasm_id varchar(255)
 );
 
 
@@ -689,8 +689,8 @@ CREATE TABLE germplasm_donor (
 --
 
 CREATE TABLE germplasm_donor_additional_info (
-    donor_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    donor_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -700,8 +700,8 @@ CREATE TABLE germplasm_donor_additional_info (
 --
 
 CREATE TABLE germplasm_donor_external_references (
-    donor_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    donor_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -711,7 +711,7 @@ CREATE TABLE germplasm_donor_external_references (
 --
 
 CREATE TABLE germplasm_entity_type_of_germplasm_storage_code (
-    germplasm_entity_id text NOT NULL,
+    germplasm_entity_id varchar(255) NOT NULL,
     type_of_germplasm_storage_code integer
 );
 
@@ -722,8 +722,8 @@ CREATE TABLE germplasm_entity_type_of_germplasm_storage_code (
 --
 
 CREATE TABLE germplasm_external_references (
-    germplasm_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    germplasm_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -744,12 +744,12 @@ CREATE TABLE germplasm_germplasm_type_storage_code (
 --
 
 CREATE TABLE germplasm_institute (
-    id text NOT NULL,
-    institute_address text,
-    institute_code text,
-    institute_name text,
+    id varchar(255) NOT NULL,
+    institute_address varchar(255),
+    institute_code varchar(255),
+    institute_name varchar(255),
     institute_type integer,
-    germplasm_id text
+    germplasm_id varchar(255)
 );
 
 
@@ -759,10 +759,10 @@ CREATE TABLE germplasm_institute (
 --
 
 CREATE TABLE germplasm_origin (
-    id text NOT NULL,
-    coordinate_uncertainty text,
-    coordinates_id text,
-    germplasm_id text
+    id varchar(255) NOT NULL,
+    coordinate_uncertainty varchar(255),
+    coordinates_id varchar(255),
+    germplasm_id varchar(255)
 );
 
 
@@ -772,8 +772,8 @@ CREATE TABLE germplasm_origin (
 --
 
 CREATE TABLE germplasm_search_results (
-    germplasm_entity_id text NOT NULL,
-    search_results_id text NOT NULL
+    germplasm_entity_id varchar(255) NOT NULL,
+    search_results_id varchar(255) NOT NULL
 );
 
 
@@ -783,10 +783,10 @@ CREATE TABLE germplasm_search_results (
 --
 
 CREATE TABLE germplasm_synonym (
-    id text NOT NULL,
-    synonym text,
-    type text,
-    germplasm_id text
+    id varchar(255) NOT NULL,
+    synonym varchar(255),
+    type varchar(255),
+    germplasm_id varchar(255)
 );
 
 
@@ -796,10 +796,10 @@ CREATE TABLE germplasm_synonym (
 --
 
 CREATE TABLE germplasm_taxon (
-    id text NOT NULL,
-    source_name text,
-    taxon_id text,
-    germplasm_id text
+    id varchar(255) NOT NULL,
+    source_name varchar(255),
+    taxon_id varchar(255),
+    germplasm_id varchar(255)
 );
 
 
@@ -833,21 +833,21 @@ CREATE SEQUENCE hibernate_sequence
 --
 
 CREATE TABLE image (
-    id text NOT NULL,
-    auth_user_id text,
-    copyright text,
-    description text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    copyright varchar(255),
+    description varchar(255),
     image_data bytea,
-    image_file_name text,
+    image_file_name varchar(255),
     image_file_size integer,
     image_height integer,
-    imagemimetype text,
-    imageurl text,
+    imagemimetype varchar(255),
+    imageurl varchar(255),
     image_width integer,
-    name text,
+    name varchar(255),
     time_stamp timestamp without time zone,
-    coordinates_id text,
-    observation_unit_id text
+    coordinates_id varchar(255),
+    observation_unit_id varchar(255)
 );
 
 
@@ -857,8 +857,8 @@ CREATE TABLE image (
 --
 
 CREATE TABLE image_additional_info (
-    image_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    image_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -879,8 +879,8 @@ CREATE TABLE image_entity_additional_info (
 --
 
 CREATE TABLE image_entity_descriptive_ontology_terms (
-    image_entity_id text NOT NULL,
-    descriptive_ontology_terms text
+    image_entity_id varchar(255) NOT NULL,
+    descriptive_ontology_terms varchar(255)
 );
 
 
@@ -890,8 +890,8 @@ CREATE TABLE image_entity_descriptive_ontology_terms (
 --
 
 CREATE TABLE image_external_references (
-    image_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    image_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -901,8 +901,8 @@ CREATE TABLE image_external_references (
 --
 
 CREATE TABLE image_observations (
-    image_entity_id text NOT NULL,
-    observations_id text NOT NULL
+    image_entity_id varchar(255) NOT NULL,
+    observations_id varchar(255) NOT NULL
 );
 
 
@@ -912,11 +912,11 @@ CREATE TABLE image_observations (
 --
 
 CREATE TABLE linkage_group (
-    id text NOT NULL,
-    auth_user_id text,
-    linkage_group_name text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    linkage_group_name varchar(255),
     max_marker_position integer,
-    genome_map_id text
+    genome_map_id varchar(255)
 );
 
 
@@ -926,8 +926,8 @@ CREATE TABLE linkage_group (
 --
 
 CREATE TABLE linkage_group_additional_info (
-    linkage_group_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    linkage_group_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -937,8 +937,8 @@ CREATE TABLE linkage_group_additional_info (
 --
 
 CREATE TABLE linkage_group_external_references (
-    linkage_group_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    linkage_group_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -948,16 +948,16 @@ CREATE TABLE linkage_group_external_references (
 --
 
 CREATE TABLE list (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     date_created timestamp without time zone,
     date_modified timestamp without time zone,
-    description text,
-    list_name text,
-    list_owner_name text,
-    list_source text,
+    description varchar(255),
+    list_name varchar(255),
+    list_owner_name varchar(255),
+    list_source varchar(255),
     list_type integer,
-    list_owner_person_id text
+    list_owner_person_id varchar(255)
 );
 
 
@@ -967,8 +967,8 @@ CREATE TABLE list (
 --
 
 CREATE TABLE list_additional_info (
-    list_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    list_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -978,8 +978,8 @@ CREATE TABLE list_additional_info (
 --
 
 CREATE TABLE list_external_references (
-    list_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    list_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -989,9 +989,9 @@ CREATE TABLE list_external_references (
 --
 
 CREATE TABLE list_item (
-    id text NOT NULL,
-    item text,
-    list_id text
+    id varchar(255) NOT NULL,
+    item varchar(255),
+    list_id varchar(255)
 );
 
 
@@ -1001,27 +1001,27 @@ CREATE TABLE list_item (
 --
 
 CREATE TABLE location (
-    id text NOT NULL,
-    auth_user_id text,
-    abbreviation text,
-    coordinate_description text,
-    coordinate_uncertainty text,
-    country_code text,
-    country_name text,
-    documentationurl text,
-    environment_type text,
-    exposure text,
-    institute_address text,
-    institute_name text,
-    location_name text,
-    location_type text,
-    site_status text,
-    slope text,
-    topography text,
-    coordinates_id text,
-    crop_id text,
-    parent_location_id text,
-    program_id text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    abbreviation varchar(255),
+    coordinate_description varchar(255),
+    coordinate_uncertainty varchar(255),
+    country_code varchar(255),
+    country_name varchar(255),
+    documentationurl varchar(255),
+    environment_type varchar(255),
+    exposure varchar(255),
+    institute_address varchar(255),
+    institute_name varchar(255),
+    location_name varchar(255),
+    location_type varchar(255),
+    site_status varchar(255),
+    slope varchar(255),
+    topography varchar(255),
+    coordinates_id varchar(255),
+    crop_id varchar(255),
+    parent_location_id varchar(255),
+    program_id varchar(255)
 );
 
 
@@ -1031,8 +1031,8 @@ CREATE TABLE location (
 --
 
 CREATE TABLE location_additional_info (
-    location_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    location_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1042,8 +1042,8 @@ CREATE TABLE location_additional_info (
 --
 
 CREATE TABLE location_external_references (
-    location_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    location_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1089,11 +1089,11 @@ CREATE TABLE marker_marker_analysis_method (
 --
 
 CREATE TABLE marker_position (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     "position" integer,
-    linkage_group_id text,
-    variant_id text
+    linkage_group_id varchar(255),
+    variant_id varchar(255)
 );
 
 
@@ -1103,8 +1103,8 @@ CREATE TABLE marker_position (
 --
 
 CREATE TABLE marker_position_additional_info (
-    marker_position_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    marker_position_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1114,8 +1114,8 @@ CREATE TABLE marker_position_additional_info (
 --
 
 CREATE TABLE marker_position_external_references (
-    marker_position_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    marker_position_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1165,15 +1165,15 @@ CREATE TABLE marker_synonym (
 --
 
 CREATE TABLE method (
-    id text NOT NULL,
-    auth_user_id text,
-    description text,
-    formula text,
-    method_class text,
-    methodpui text,
-    name text,
-    reference text,
-    ontology_id text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    description varchar(255),
+    formula varchar(255),
+    method_class varchar(255),
+    methodpui varchar(255),
+    name varchar(255),
+    reference varchar(255),
+    ontology_id varchar(255)
 );
 
 
@@ -1183,8 +1183,8 @@ CREATE TABLE method (
 --
 
 CREATE TABLE method_additional_info (
-    method_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    method_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1194,8 +1194,8 @@ CREATE TABLE method_additional_info (
 --
 
 CREATE TABLE method_external_references (
-    method_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    method_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1205,8 +1205,8 @@ CREATE TABLE method_external_references (
 --
 
 CREATE TABLE method_ontology_reference (
-    method_entity_id text NOT NULL,
-    ontology_reference_id text NOT NULL
+    method_entity_id varchar(255) NOT NULL,
+    ontology_reference_id varchar(255) NOT NULL
 );
 
 
@@ -1216,20 +1216,20 @@ CREATE TABLE method_ontology_reference (
 --
 
 CREATE TABLE observation (
-    id text NOT NULL,
-    auth_user_id text,
-    collector text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    collector varchar(255),
     observation_time_stamp timestamp without time zone,
-    uploaded_by text,
-    value text,
-    crop_id text,
-    geo_coordinates_id text,
-    observation_unit_id text,
-    observation_variable_id text,
-    program_id text,
-    season_id text,
-    study_id text,
-    trial_id text
+    uploaded_by varchar(255),
+    value varchar(255),
+    crop_id varchar(255),
+    geo_coordinates_id varchar(255),
+    observation_unit_id varchar(255),
+    observation_variable_id varchar(255),
+    program_id varchar(255),
+    season_id varchar(255),
+    study_id varchar(255),
+    trial_id varchar(255)
 );
 
 
@@ -1239,8 +1239,8 @@ CREATE TABLE observation (
 --
 
 CREATE TABLE observation_additional_info (
-    observation_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    observation_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1250,8 +1250,8 @@ CREATE TABLE observation_additional_info (
 --
 
 CREATE TABLE observation_external_references (
-    observation_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    observation_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1261,17 +1261,17 @@ CREATE TABLE observation_external_references (
 --
 
 CREATE TABLE observation_unit (
-    id text NOT NULL,
-    auth_user_id text,
-    observation_unit_name text,
-    observation_unitpui text,
-    crop_id text,
-    cross_id text,
-    germplasm_id text,
-    program_id text,
-    seed_lot_id text,
-    study_id text,
-    trial_id text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    observation_unit_name varchar(255),
+    observation_unitpui varchar(255),
+    crop_id varchar(255),
+    cross_id varchar(255),
+    germplasm_id varchar(255),
+    program_id varchar(255),
+    seed_lot_id varchar(255),
+    study_id varchar(255),
+    trial_id varchar(255)
 );
 
 
@@ -1281,8 +1281,8 @@ CREATE TABLE observation_unit (
 --
 
 CREATE TABLE observation_unit_additional_info (
-    observation_unit_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    observation_unit_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1292,8 +1292,8 @@ CREATE TABLE observation_unit_additional_info (
 --
 
 CREATE TABLE observation_unit_external_references (
-    observation_unit_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    observation_unit_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1303,12 +1303,12 @@ CREATE TABLE observation_unit_external_references (
 --
 
 CREATE TABLE observation_unit_level (
-    id text NOT NULL,
-    level_code text,
+    id varchar(255) NOT NULL,
+    level_code varchar(255),
     level_name integer,
     level_order integer,
-    observation_unit_id text,
-    position_id text
+    observation_unit_id varchar(255),
+    position_id varchar(255)
 );
 
 
@@ -1318,17 +1318,17 @@ CREATE TABLE observation_unit_level (
 --
 
 CREATE TABLE observation_unit_position (
-    id text NOT NULL,
+    id varchar(255) NOT NULL,
     entry_type integer,
-    level_code text,
+    level_code varchar(255),
     level_name integer,
     level_order integer,
-    position_coordinatex text,
+    position_coordinatex varchar(255),
     position_coordinatextype integer,
-    position_coordinatey text,
+    position_coordinatey varchar(255),
     position_coordinateytype integer,
-    geo_coordinates_id text,
-    observation_unit_id text
+    geo_coordinates_id varchar(255),
+    observation_unit_id varchar(255)
 );
 
 
@@ -1338,10 +1338,10 @@ CREATE TABLE observation_unit_position (
 --
 
 CREATE TABLE observation_unit_treatment (
-    id text NOT NULL,
-    factor text,
-    modality text,
-    observation_unit_id text
+    id varchar(255) NOT NULL,
+    factor varchar(255),
+    modality varchar(255),
+    observation_unit_id varchar(255)
 );
 
 
@@ -1364,23 +1364,23 @@ CREATE TABLE observation_unit_xref (
 --
 
 CREATE TABLE observation_variable (
-    id text NOT NULL,
-    auth_user_id text,
-    default_value text,
-    documentationurl text,
-    growth_stage text,
-    institution text,
-    language text,
-    scientist text,
-    status text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    default_value varchar(255),
+    documentationurl varchar(255),
+    growth_stage varchar(255),
+    institution varchar(255),
+    language varchar(255),
+    scientist varchar(255),
+    status varchar(255),
     submission_timestamp timestamp without time zone,
-    crop_id text,
-    method_id text,
-    ontology_id text,
-    scale_id text,
-    trait_id text,
-    name text,
-    pui text
+    crop_id varchar(255),
+    method_id varchar(255),
+    ontology_id varchar(255),
+    scale_id varchar(255),
+    trait_id varchar(255),
+    name varchar(255),
+    pui varchar(255)
 );
 
 
@@ -1414,15 +1414,15 @@ CREATE TABLE observation_variable_synonym (
 --
 
 CREATE TABLE ontology (
-    id text NOT NULL,
-    auth_user_id text,
-    authors text,
-    copyright text,
-    description text,
-    documentationurl text,
-    licence text,
-    ontology_name text,
-    version text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    authors varchar(255),
+    copyright varchar(255),
+    description varchar(255),
+    documentationurl varchar(255),
+    licence varchar(255),
+    ontology_name varchar(255),
+    version varchar(255)
 );
 
 
@@ -1432,8 +1432,8 @@ CREATE TABLE ontology (
 --
 
 CREATE TABLE ontology_additional_info (
-    ontology_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    ontology_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1443,8 +1443,8 @@ CREATE TABLE ontology_additional_info (
 --
 
 CREATE TABLE ontology_entity_documentation_links (
-    ontology_entity_id text NOT NULL,
-    documentation_links text
+    ontology_entity_id varchar(255) NOT NULL,
+    documentation_links varchar(255)
 );
 
 
@@ -1454,8 +1454,8 @@ CREATE TABLE ontology_entity_documentation_links (
 --
 
 CREATE TABLE ontology_external_references (
-    ontology_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    ontology_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1465,8 +1465,8 @@ CREATE TABLE ontology_external_references (
 --
 
 CREATE TABLE ontology_ref (
-    id text NOT NULL,
-    url text,
+    id varchar(255) NOT NULL,
+    url varchar(255),
     type integer
 );
 
@@ -1497,12 +1497,12 @@ CREATE TABLE pedigree (
 --
 
 CREATE TABLE pedigree_edge (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     edge_type integer,
     parent_type integer,
-    connceted_node_id text,
-    this_node_id text
+    connceted_node_id varchar(255),
+    this_node_id varchar(255)
 );
 
 
@@ -1512,8 +1512,8 @@ CREATE TABLE pedigree_edge (
 --
 
 CREATE TABLE pedigree_edge_additional_info (
-    pedigree_edge_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    pedigree_edge_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1523,8 +1523,8 @@ CREATE TABLE pedigree_edge_additional_info (
 --
 
 CREATE TABLE pedigree_edge_external_references (
-    pedigree_edge_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    pedigree_edge_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1534,13 +1534,13 @@ CREATE TABLE pedigree_edge_external_references (
 --
 
 CREATE TABLE pedigree_node (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     crossing_year integer,
-    family_code text,
-    pedigree_string text,
-    crossing_project_id text,
-    germplasm_id text
+    family_code varchar(255),
+    pedigree_string varchar(255),
+    crossing_project_id varchar(255),
+    germplasm_id varchar(255)
 );
 
 
@@ -1550,8 +1550,8 @@ CREATE TABLE pedigree_node (
 --
 
 CREATE TABLE pedigree_node_additional_info (
-    pedigree_node_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    pedigree_node_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1561,8 +1561,8 @@ CREATE TABLE pedigree_node_additional_info (
 --
 
 CREATE TABLE pedigree_node_external_references (
-    pedigree_node_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    pedigree_node_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1572,17 +1572,17 @@ CREATE TABLE pedigree_node_external_references (
 --
 
 CREATE TABLE person (
-    id text NOT NULL,
-    auth_user_id text,
-    description text,
-    email_address text,
-    first_name text,
-    institute_name text,
-    last_name text,
-    mailing_address text,
-    middle_name text,
-    phone_number text,
-    userid text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    description varchar(255),
+    email_address varchar(255),
+    first_name varchar(255),
+    institute_name varchar(255),
+    last_name varchar(255),
+    mailing_address varchar(255),
+    middle_name varchar(255),
+    phone_number varchar(255),
+    userid varchar(255)
 );
 
 
@@ -1592,8 +1592,8 @@ CREATE TABLE person (
 --
 
 CREATE TABLE person_additional_info (
-    person_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    person_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1603,8 +1603,8 @@ CREATE TABLE person_additional_info (
 --
 
 CREATE TABLE person_external_references (
-    person_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    person_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1614,20 +1614,20 @@ CREATE TABLE person_external_references (
 --
 
 CREATE TABLE plate (
-    id text NOT NULL,
-    auth_user_id text,
-    client_plate_barcode text,
-    client_plate_db_id text,
-    plate_barcode text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    client_plate_barcode varchar(255),
+    client_plate_db_id varchar(255),
+    plate_barcode varchar(255),
     plate_format integer,
-    plate_name text,
+    plate_name varchar(255),
     sample_submission_format integer,
     sample_type integer,
     status_time_stamp timestamp without time zone,
-    program_id text,
-    study_id text,
-    submission_id text,
-    trial_id text
+    program_id varchar(255),
+    study_id varchar(255),
+    submission_id varchar(255),
+    trial_id varchar(255)
 );
 
 
@@ -1637,8 +1637,8 @@ CREATE TABLE plate (
 --
 
 CREATE TABLE plate_additional_info (
-    plate_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    plate_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1648,8 +1648,8 @@ CREATE TABLE plate_additional_info (
 --
 
 CREATE TABLE plate_external_references (
-    plate_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    plate_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1659,12 +1659,12 @@ CREATE TABLE plate_external_references (
 --
 
 CREATE TABLE plate_submission (
-    id text NOT NULL,
-    auth_user_id text,
-    client_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    client_id varchar(255),
     number_of_samples integer,
     sample_type integer,
-    order_id text
+    order_id varchar(255)
 );
 
 
@@ -1674,8 +1674,8 @@ CREATE TABLE plate_submission (
 --
 
 CREATE TABLE plate_submission_additional_info (
-    vendor_plate_submission_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    vendor_plate_submission_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1685,8 +1685,8 @@ CREATE TABLE plate_submission_additional_info (
 --
 
 CREATE TABLE plate_submission_external_references (
-    vendor_plate_submission_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    vendor_plate_submission_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1696,16 +1696,16 @@ CREATE TABLE plate_submission_external_references (
 --
 
 CREATE TABLE program (
-    id text NOT NULL,
-    auth_user_id text,
-    abbreviation text,
-    documentationurl text,
-    funding_information text,
-    name text,
-    objective text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    abbreviation varchar(255),
+    documentationurl varchar(255),
+    funding_information varchar(255),
+    name varchar(255),
+    objective varchar(255),
     program_type integer,
-    crop_id text,
-    lead_person_id text
+    crop_id varchar(255),
+    lead_person_id varchar(255)
 );
 
 
@@ -1715,8 +1715,8 @@ CREATE TABLE program (
 --
 
 CREATE TABLE program_additional_info (
-    program_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    program_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1726,8 +1726,8 @@ CREATE TABLE program_additional_info (
 --
 
 CREATE TABLE program_external_references (
-    program_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    program_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1737,13 +1737,13 @@ CREATE TABLE program_external_references (
 --
 
 CREATE TABLE reference (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     length integer,
-    md5checksum text,
-    reference_name text,
+    md5checksum varchar(255),
+    reference_name varchar(255),
     source_divergence numeric(19,2),
-    reference_set_id text
+    reference_set_id varchar(255)
 );
 
 
@@ -1753,8 +1753,8 @@ CREATE TABLE reference (
 --
 
 CREATE TABLE reference_additional_info (
-    reference_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    reference_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1764,11 +1764,11 @@ CREATE TABLE reference_additional_info (
 --
 
 CREATE TABLE reference_bases (
-    id text NOT NULL,
-    auth_user_id text,
-    bases text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    bases varchar(2048),
     page_number integer,
-    reference_id text
+    reference_id varchar(255)
 );
 
 
@@ -1778,8 +1778,8 @@ CREATE TABLE reference_bases (
 --
 
 CREATE TABLE reference_bases_additional_info (
-    reference_bases_page_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    reference_bases_page_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1789,8 +1789,8 @@ CREATE TABLE reference_bases_additional_info (
 --
 
 CREATE TABLE reference_bases_external_references (
-    reference_bases_page_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    reference_bases_page_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1800,8 +1800,8 @@ CREATE TABLE reference_bases_external_references (
 --
 
 CREATE TABLE reference_external_references (
-    reference_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    reference_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1811,17 +1811,17 @@ CREATE TABLE reference_external_references (
 --
 
 CREATE TABLE reference_set (
-    id text NOT NULL,
-    auth_user_id text,
-    assemblypui text,
-    description text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    assemblypui varchar(255),
+    description varchar(255),
     is_derived boolean,
-    md5checksum text,
-    reference_set_name text,
-    sourceuri text,
-    species_ontology_term text,
-    species_ontology_termuri text,
-    source_germplasm_id text
+    md5checksum varchar(255),
+    reference_set_name varchar(255),
+    sourceuri varchar(255),
+    species_ontology_term varchar(255),
+    species_ontology_termuri varchar(255),
+    source_germplasm_id varchar(255)
 );
 
 
@@ -1831,8 +1831,8 @@ CREATE TABLE reference_set (
 --
 
 CREATE TABLE reference_set_additional_info (
-    reference_set_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    reference_set_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1842,8 +1842,8 @@ CREATE TABLE reference_set_additional_info (
 --
 
 CREATE TABLE reference_set_external_references (
-    reference_set_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    reference_set_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1853,28 +1853,28 @@ CREATE TABLE reference_set_external_references (
 --
 
 CREATE TABLE sample (
-    id text NOT NULL,
-    auth_user_id text,
-    concentration text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    concentration varchar(255),
     plate_column integer,
-    plate_row text,
-    sample_barcode text,
-    sample_description text,
-    sample_group_db_id text,
-    sample_name text,
-    samplepui text,
+    plate_row varchar(255),
+    sample_barcode varchar(255),
+    sample_description varchar(255),
+    sample_group_db_id varchar(255),
+    sample_name varchar(255),
+    samplepui varchar(255),
     sample_timestamp timestamp without time zone,
-    sample_type text,
-    taken_by text,
-    tissue_type text,
-    volume text,
-    well text,
-    observation_unit_id text,
-    plate_id text,
-    program_id text,
-    study_id text,
-    taxon_id_id text,
-    trial_id text
+    sample_type varchar(255),
+    taken_by varchar(255),
+    tissue_type varchar(255),
+    volume varchar(255),
+    well varchar(255),
+    observation_unit_id varchar(255),
+    plate_id varchar(255),
+    program_id varchar(255),
+    study_id varchar(255),
+    taxon_id_id varchar(255),
+    trial_id varchar(255)
 );
 
 
@@ -1884,8 +1884,8 @@ CREATE TABLE sample (
 --
 
 CREATE TABLE sample_additional_info (
-    sample_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    sample_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1895,8 +1895,8 @@ CREATE TABLE sample_additional_info (
 --
 
 CREATE TABLE sample_external_references (
-    sample_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    sample_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1906,16 +1906,16 @@ CREATE TABLE sample_external_references (
 --
 
 CREATE TABLE scale (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     data_type integer,
     decimal_places integer,
-    scale_name text,
-    scalepui text,
-    units text,
-    valid_value_max text,
-    valid_value_min text,
-    ontology_id text
+    scale_name varchar(255),
+    scalepui varchar(255),
+    units varchar(255),
+    valid_value_max varchar(255),
+    valid_value_min varchar(255),
+    ontology_id varchar(255)
 );
 
 
@@ -1925,8 +1925,8 @@ CREATE TABLE scale (
 --
 
 CREATE TABLE scale_additional_info (
-    scale_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    scale_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -1947,8 +1947,8 @@ CREATE TABLE scale_entity_valid_value_categories (
 --
 
 CREATE TABLE scale_external_references (
-    scale_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    scale_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -1958,8 +1958,8 @@ CREATE TABLE scale_external_references (
 --
 
 CREATE TABLE scale_ontology_reference (
-    scale_entity_id text NOT NULL,
-    ontology_reference_id text NOT NULL
+    scale_entity_id varchar(255) NOT NULL,
+    ontology_reference_id varchar(255) NOT NULL
 );
 
 
@@ -1969,10 +1969,10 @@ CREATE TABLE scale_ontology_reference (
 --
 
 CREATE TABLE scale_valid_value_category (
-    id text NOT NULL,
-    label text,
-    value text,
-    scale_id text
+    id varchar(255) NOT NULL,
+    label varchar(255),
+    value varchar(255),
+    scale_id varchar(255)
 );
 
 
@@ -1982,8 +1982,8 @@ CREATE TABLE scale_valid_value_category (
 --
 
 CREATE TABLE search (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     parameters text,
     request_type integer,
     response_countdown integer
@@ -1996,8 +1996,8 @@ CREATE TABLE search (
 --
 
 CREATE TABLE search_additional_info (
-    search_request_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    search_request_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2007,8 +2007,8 @@ CREATE TABLE search_additional_info (
 --
 
 CREATE TABLE search_external_references (
-    search_request_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    search_request_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2018,9 +2018,9 @@ CREATE TABLE search_external_references (
 --
 
 CREATE TABLE season (
-    id text NOT NULL,
-    auth_user_id text,
-    season text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    season varchar(255),
     year integer
 );
 
@@ -2031,8 +2031,8 @@ CREATE TABLE season (
 --
 
 CREATE TABLE season_additional_info (
-    season_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    season_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2042,8 +2042,8 @@ CREATE TABLE season_additional_info (
 --
 
 CREATE TABLE season_external_references (
-    season_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    season_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2053,18 +2053,18 @@ CREATE TABLE season_external_references (
 --
 
 CREATE TABLE seed_lot (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     amount numeric(19,2),
     created_date timestamp without time zone,
-    description text,
+    description varchar(255),
     last_updated timestamp without time zone,
-    name text,
-    source_collection text,
-    storage_location text,
-    units text,
-    location_id text,
-    program_id text
+    name varchar(255),
+    source_collection varchar(255),
+    storage_location varchar(255),
+    units varchar(255),
+    location_id varchar(255),
+    program_id varchar(255)
 );
 
 
@@ -2074,8 +2074,8 @@ CREATE TABLE seed_lot (
 --
 
 CREATE TABLE seed_lot_additional_info (
-    seed_lot_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    seed_lot_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2085,11 +2085,11 @@ CREATE TABLE seed_lot_additional_info (
 --
 
 CREATE TABLE seed_lot_content_mixture (
-    id text NOT NULL,
+    id varchar(255) NOT NULL,
     mixture_percentage integer,
-    cross_id text,
-    germplasm_id text,
-    seed_lot_id text
+    cross_id varchar(255),
+    germplasm_id varchar(255),
+    seed_lot_id varchar(255)
 );
 
 
@@ -2099,8 +2099,8 @@ CREATE TABLE seed_lot_content_mixture (
 --
 
 CREATE TABLE seed_lot_external_references (
-    seed_lot_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    seed_lot_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2110,14 +2110,14 @@ CREATE TABLE seed_lot_external_references (
 --
 
 CREATE TABLE seed_lot_transaction (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     amount numeric(19,2),
-    description text,
+    description varchar(255),
     "timestamp" timestamp without time zone,
-    units text,
-    from_seed_lot_id text,
-    to_seed_lot_id text
+    units varchar(255),
+    from_seed_lot_id varchar(255),
+    to_seed_lot_id varchar(255)
 );
 
 
@@ -2127,8 +2127,8 @@ CREATE TABLE seed_lot_transaction (
 --
 
 CREATE TABLE seed_lot_transaction_additional_info (
-    seed_lot_transaction_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    seed_lot_transaction_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2138,8 +2138,8 @@ CREATE TABLE seed_lot_transaction_additional_info (
 --
 
 CREATE TABLE seed_lot_transaction_external_references (
-    seed_lot_transaction_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    seed_lot_transaction_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2149,24 +2149,24 @@ CREATE TABLE seed_lot_transaction_external_references (
 --
 
 CREATE TABLE study (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     active boolean,
-    cultural_practices text,
-    documentationurl text,
+    cultural_practices varchar(255),
+    documentationurl varchar(255),
     end_date timestamp without time zone,
-    license text,
-    observation_units_description text,
+    license varchar(255),
+    observation_units_description varchar(255),
     start_date timestamp without time zone,
-    study_code text,
-    study_description text,
-    study_name text,
-    studypui text,
-    study_type text,
-    crop_id text,
-    location_id text,
-    program_id text,
-    trial_id text
+    study_code varchar(255),
+    study_description varchar(255),
+    study_name varchar(255),
+    studypui varchar(255),
+    study_type varchar(255),
+    crop_id varchar(255),
+    location_id varchar(255),
+    program_id varchar(255),
+    trial_id varchar(255)
 );
 
 
@@ -2176,8 +2176,8 @@ CREATE TABLE study (
 --
 
 CREATE TABLE study_additional_info (
-    study_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    study_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2187,8 +2187,8 @@ CREATE TABLE study_additional_info (
 --
 
 CREATE TABLE study_contact (
-    study_db_id text NOT NULL,
-    person_db_id text NOT NULL
+    study_db_id varchar(255) NOT NULL,
+    person_db_id varchar(255) NOT NULL
 );
 
 
@@ -2198,16 +2198,16 @@ CREATE TABLE study_contact (
 --
 
 CREATE TABLE study_data_link (
-    id text NOT NULL,
-    data_format text,
-    description text,
-    file_format text,
-    name text,
-    provenance text,
-    scientific_type text,
-    url text,
-    version text,
-    study_id text
+    id varchar(255) NOT NULL,
+    data_format varchar(255),
+    description varchar(255),
+    file_format varchar(255),
+    name varchar(255),
+    provenance varchar(255),
+    scientific_type varchar(255),
+    url varchar(255),
+    version varchar(255),
+    study_id varchar(255)
 );
 
 
@@ -2217,15 +2217,15 @@ CREATE TABLE study_data_link (
 --
 
 CREATE TABLE study_environment_parameter (
-    id text NOT NULL,
-    description text,
-    parameter_name text,
-    parameterpui text,
-    unit text,
-    unitpui text,
-    value text,
-    valuepui text,
-    study_id text
+    id varchar(255) NOT NULL,
+    description varchar(255),
+    parameter_name varchar(255),
+    parameterpui varchar(255),
+    unit varchar(255),
+    unitpui varchar(255),
+    value varchar(255),
+    valuepui varchar(255),
+    study_id varchar(255)
 );
 
 
@@ -2235,10 +2235,10 @@ CREATE TABLE study_environment_parameter (
 --
 
 CREATE TABLE study_experimental_design (
-    id text NOT NULL,
-    pui text,
-    description text,
-    study_id text
+    id varchar(255) NOT NULL,
+    pui varchar(255),
+    description varchar(255),
+    study_id varchar(255)
 );
 
 
@@ -2248,8 +2248,8 @@ CREATE TABLE study_experimental_design (
 --
 
 CREATE TABLE study_external_references (
-    study_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    study_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2259,10 +2259,10 @@ CREATE TABLE study_external_references (
 --
 
 CREATE TABLE study_growth_facility (
-    id text NOT NULL,
-    pui text,
-    description text,
-    study_id text
+    id varchar(255) NOT NULL,
+    pui varchar(255),
+    description varchar(255),
+    study_id varchar(255)
 );
 
 
@@ -2272,10 +2272,10 @@ CREATE TABLE study_growth_facility (
 --
 
 CREATE TABLE study_last_update (
-    id text NOT NULL,
+    id varchar(255) NOT NULL,
     "timestamp" timestamp without time zone,
-    version text,
-    study_id text
+    version varchar(255),
+    study_id varchar(255)
 );
 
 
@@ -2296,10 +2296,10 @@ CREATE TABLE study_marker_profile (
 --
 
 CREATE TABLE study_observation_level (
-    id text NOT NULL,
-    level_name text,
+    id varchar(255) NOT NULL,
+    level_name varchar(255),
     level_order integer,
-    study_id text
+    study_id varchar(255)
 );
 
 
@@ -2309,8 +2309,8 @@ CREATE TABLE study_observation_level (
 --
 
 CREATE TABLE study_season (
-    study_db_id text NOT NULL,
-    season_db_id text NOT NULL
+    study_db_id varchar(255) NOT NULL,
+    season_db_id varchar(255) NOT NULL
 );
 
 
@@ -2332,8 +2332,8 @@ CREATE TABLE study_type (
 --
 
 CREATE TABLE study_variable (
-    study_db_id text NOT NULL,
-    variable_db_id text NOT NULL
+    study_db_id varchar(255) NOT NULL,
+    variable_db_id varchar(255) NOT NULL
 );
 
 
@@ -2355,19 +2355,19 @@ CREATE TABLE taxon (
 --
 
 CREATE TABLE trait (
-    id text NOT NULL,
-    auth_user_id text,
-    attribute text,
-    attributepui text,
-    entity text,
-    entitypui text,
-    main_abbreviation text,
-    status text,
-    trait_class text,
-    trait_description text,
-    trait_name text,
-    traitpui text,
-    ontology_id text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    attribute varchar(255),
+    attributepui varchar(255),
+    entity varchar(255),
+    entitypui varchar(255),
+    main_abbreviation varchar(255),
+    status varchar(255),
+    trait_class varchar(255),
+    trait_description varchar(255),
+    trait_name varchar(255),
+    traitpui varchar(255),
+    ontology_id varchar(255)
 );
 
 
@@ -2377,9 +2377,9 @@ CREATE TABLE trait (
 --
 
 CREATE TABLE trait_abbreviation (
-    id text NOT NULL,
-    abbreviation text,
-    trait_id text
+    id varchar(255) NOT NULL,
+    abbreviation varchar(255),
+    trait_id varchar(255)
 );
 
 
@@ -2389,8 +2389,8 @@ CREATE TABLE trait_abbreviation (
 --
 
 CREATE TABLE trait_additional_info (
-    trait_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    trait_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2400,8 +2400,8 @@ CREATE TABLE trait_additional_info (
 --
 
 CREATE TABLE trait_entity_alternative_abbreviations (
-    trait_entity_id text NOT NULL,
-    alternative_abbreviations text
+    trait_entity_id varchar(255) NOT NULL,
+    alternative_abbreviations varchar(255)
 );
 
 
@@ -2411,8 +2411,8 @@ CREATE TABLE trait_entity_alternative_abbreviations (
 --
 
 CREATE TABLE trait_entity_synonyms (
-    trait_entity_id text NOT NULL,
-    synonyms text
+    trait_entity_id varchar(255) NOT NULL,
+    synonyms varchar(255)
 );
 
 
@@ -2422,8 +2422,8 @@ CREATE TABLE trait_entity_synonyms (
 --
 
 CREATE TABLE trait_external_references (
-    trait_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    trait_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2433,8 +2433,8 @@ CREATE TABLE trait_external_references (
 --
 
 CREATE TABLE trait_ontology_reference (
-    trait_entity_id text NOT NULL,
-    ontology_reference_id text NOT NULL
+    trait_entity_id varchar(255) NOT NULL,
+    ontology_reference_id varchar(255) NOT NULL
 );
 
 
@@ -2444,9 +2444,9 @@ CREATE TABLE trait_ontology_reference (
 --
 
 CREATE TABLE trait_synonym (
-    id text NOT NULL,
-    synonym text,
-    trait_id text
+    id varchar(255) NOT NULL,
+    synonym varchar(255),
+    trait_id varchar(255)
 );
 
 
@@ -2469,17 +2469,17 @@ CREATE TABLE treatment (
 --
 
 CREATE TABLE trial (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     active boolean,
-    documentationurl text,
+    documentationurl varchar(255),
     end_date timestamp without time zone,
     start_date timestamp without time zone,
-    trial_description text,
-    trial_name text,
-    trialpui text,
-    crop_id text,
-    program_id text
+    trial_description varchar(255),
+    trial_name varchar(255),
+    trialpui varchar(255),
+    crop_id varchar(255),
+    program_id varchar(255)
 );
 
 
@@ -2489,8 +2489,8 @@ CREATE TABLE trial (
 --
 
 CREATE TABLE trial_additional_info (
-    trial_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    trial_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2500,8 +2500,8 @@ CREATE TABLE trial_additional_info (
 --
 
 CREATE TABLE trial_contact (
-    trial_db_id text NOT NULL,
-    person_db_id text NOT NULL
+    trial_db_id varchar(255) NOT NULL,
+    person_db_id varchar(255) NOT NULL
 );
 
 
@@ -2511,12 +2511,12 @@ CREATE TABLE trial_contact (
 --
 
 CREATE TABLE trial_dataset_authorship (
-    id text NOT NULL,
-    datasetpui text,
-    license text,
+    id varchar(255) NOT NULL,
+    datasetpui varchar(255),
+    license varchar(255),
     public_release_date timestamp without time zone,
     submission_date timestamp without time zone,
-    trial_id text
+    trial_id varchar(255)
 );
 
 
@@ -2526,8 +2526,8 @@ CREATE TABLE trial_dataset_authorship (
 --
 
 CREATE TABLE trial_external_references (
-    trial_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    trial_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2537,10 +2537,10 @@ CREATE TABLE trial_external_references (
 --
 
 CREATE TABLE trial_publication (
-    id text NOT NULL,
-    publicationpui text,
-    publication_reference text,
-    trial_id text
+    id varchar(255) NOT NULL,
+    publicationpui varchar(255),
+    publication_reference varchar(255),
+    trial_id varchar(255)
 );
 
 
@@ -2550,21 +2550,21 @@ CREATE TABLE trial_publication (
 --
 
 CREATE TABLE variable_base_entity (
-    id text NOT NULL,
-    auth_user_id text,
-    default_value text,
-    documentationurl text,
-    growth_stage text,
-    institution text,
-    language text,
-    scientist text,
-    status text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    default_value varchar(255),
+    documentationurl varchar(255),
+    growth_stage varchar(255),
+    institution varchar(255),
+    language varchar(255),
+    scientist varchar(255),
+    status varchar(255),
     submission_timestamp timestamp without time zone,
-    crop_id text,
-    method_id text,
-    ontology_id text,
-    scale_id text,
-    trait_id text
+    crop_id varchar(255),
+    method_id varchar(255),
+    ontology_id varchar(255),
+    scale_id varchar(255),
+    trait_id varchar(255)
 );
 
 
@@ -2574,8 +2574,8 @@ CREATE TABLE variable_base_entity (
 --
 
 CREATE TABLE variable_base_entity_additional_info (
-    variable_base_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    variable_base_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2585,8 +2585,8 @@ CREATE TABLE variable_base_entity_additional_info (
 --
 
 CREATE TABLE variable_base_entity_context_of_use (
-    variable_base_entity_id text NOT NULL,
-    context_of_use text
+    variable_base_entity_id varchar(255) NOT NULL,
+    context_of_use varchar(255)
 );
 
 
@@ -2596,8 +2596,8 @@ CREATE TABLE variable_base_entity_context_of_use (
 --
 
 CREATE TABLE variable_base_entity_external_references (
-    variable_base_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    variable_base_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2607,8 +2607,8 @@ CREATE TABLE variable_base_entity_external_references (
 --
 
 CREATE TABLE variable_base_entity_ontology_reference (
-    variable_base_entity_id text NOT NULL,
-    ontology_reference_id text NOT NULL
+    variable_base_entity_id varchar(255) NOT NULL,
+    ontology_reference_id varchar(255) NOT NULL
 );
 
 
@@ -2618,8 +2618,8 @@ CREATE TABLE variable_base_entity_ontology_reference (
 --
 
 CREATE TABLE variable_base_entity_synonyms (
-    variable_base_entity_id text NOT NULL,
-    synonyms text
+    variable_base_entity_id varchar(255) NOT NULL,
+    synonyms varchar(255)
 );
 
 
@@ -2629,20 +2629,20 @@ CREATE TABLE variable_base_entity_synonyms (
 --
 
 CREATE TABLE variant (
-    id text NOT NULL,
-    auth_user_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
     created timestamp without time zone,
     variant_end integer,
     filters_applied boolean,
     filters_passed boolean,
-    reference_bases text,
+    reference_bases varchar(255),
     variant_start integer,
     svlen integer,
     updated timestamp without time zone,
-    variant_name text,
-    variant_type text,
-    reference_set_id text,
-    variant_set_id text
+    variant_name varchar(255),
+    variant_type varchar(255),
+    reference_set_id varchar(255),
+    variant_set_id varchar(255)
 );
 
 
@@ -2652,8 +2652,8 @@ CREATE TABLE variant (
 --
 
 CREATE TABLE variant_additional_info (
-    variant_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    variant_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2663,8 +2663,8 @@ CREATE TABLE variant_additional_info (
 --
 
 CREATE TABLE variant_entity_alternate_bases (
-    variant_entity_id text NOT NULL,
-    alternate_bases text
+    variant_entity_id varchar(255) NOT NULL,
+    alternate_bases varchar(255)
 );
 
 
@@ -2674,7 +2674,7 @@ CREATE TABLE variant_entity_alternate_bases (
 --
 
 CREATE TABLE variant_entity_ciend (
-    variant_entity_id text NOT NULL,
+    variant_entity_id varchar(255) NOT NULL,
     ciend integer
 );
 
@@ -2685,7 +2685,7 @@ CREATE TABLE variant_entity_ciend (
 --
 
 CREATE TABLE variant_entity_cipos (
-    variant_entity_id text NOT NULL,
+    variant_entity_id varchar(255) NOT NULL,
     cipos integer
 );
 
@@ -2696,8 +2696,8 @@ CREATE TABLE variant_entity_cipos (
 --
 
 CREATE TABLE variant_entity_filters_failed (
-    variant_entity_id text NOT NULL,
-    filters_failed text
+    variant_entity_id varchar(255) NOT NULL,
+    filters_failed varchar(255)
 );
 
 
@@ -2707,8 +2707,8 @@ CREATE TABLE variant_entity_filters_failed (
 --
 
 CREATE TABLE variant_external_references (
-    variant_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    variant_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2718,8 +2718,8 @@ CREATE TABLE variant_external_references (
 --
 
 CREATE TABLE variant_set_analysis_entity_software (
-    variant_set_analysis_entity_id text NOT NULL,
-    software text
+    variant_set_analysis_entity_id varchar(255) NOT NULL,
+    software varchar(255)
 );
 
 
@@ -2729,11 +2729,11 @@ CREATE TABLE variant_set_analysis_entity_software (
 --
 
 CREATE TABLE variantset (
-    id text NOT NULL,
-    auth_user_id text,
-    variant_set_name text,
-    reference_set_id text,
-    study_id text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    variant_set_name varchar(255),
+    reference_set_id varchar(255),
+    study_id varchar(255)
 );
 
 
@@ -2743,8 +2743,8 @@ CREATE TABLE variantset (
 --
 
 CREATE TABLE variantset_additional_info (
-    variant_set_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    variant_set_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2754,13 +2754,13 @@ CREATE TABLE variantset_additional_info (
 --
 
 CREATE TABLE variantset_analysis (
-    id text NOT NULL,
-    analysis_name text,
+    id varchar(255) NOT NULL,
+    analysis_name varchar(255),
     created timestamp without time zone,
-    description text,
-    type text,
+    description varchar(255),
+    type varchar(255),
     updated timestamp without time zone,
-    variant_set_id text
+    variant_set_id varchar(255)
 );
 
 
@@ -2770,8 +2770,8 @@ CREATE TABLE variantset_analysis (
 --
 
 CREATE TABLE variantset_external_references (
-    variant_set_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    variant_set_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2781,15 +2781,15 @@ CREATE TABLE variantset_external_references (
 --
 
 CREATE TABLE variantset_format (
-    id text NOT NULL,
+    id varchar(255) NOT NULL,
     data_format integer,
     expand_homozygotes boolean,
     file_format integer,
-    fileurl text,
-    sep_phased text,
-    sep_unphased text,
-    unknown_string text,
-    variant_set_id text
+    fileurl varchar(255),
+    sep_phased varchar(255),
+    sep_unphased varchar(255),
+    unknown_string varchar(255),
+    variant_set_id varchar(255)
 );
 
 
@@ -2799,12 +2799,12 @@ CREATE TABLE variantset_format (
 --
 
 CREATE TABLE vendor_file (
-    id text NOT NULL,
-    url text,
-    file_type text,
-    filename text,
-    md5sum text,
-    order_id text
+    id varchar(255) NOT NULL,
+    url varchar(255),
+    file_type varchar(255),
+    filename varchar(255),
+    md5sum varchar(255),
+    order_id varchar(255)
 );
 
 
@@ -2814,8 +2814,8 @@ CREATE TABLE vendor_file (
 --
 
 CREATE TABLE vendor_file_sample (
-    verndor_file_dbid text NOT NULL,
-    sample_dbid text NOT NULL
+    verndor_file_dbid varchar(255) NOT NULL,
+    sample_dbid varchar(255) NOT NULL
 );
 
 
@@ -2825,10 +2825,10 @@ CREATE TABLE vendor_file_sample (
 --
 
 CREATE TABLE vendor_order (
-    id text NOT NULL,
-    auth_user_id text,
-    client_plate_barcode text,
-    client_plate_db_id text,
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    client_plate_barcode varchar(255),
+    client_plate_db_id varchar(255),
     sample_type integer,
     status integer,
     status_time_stamp timestamp without time zone
@@ -2841,8 +2841,8 @@ CREATE TABLE vendor_order (
 --
 
 CREATE TABLE vendor_order_additional_info (
-    vendor_order_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    vendor_order_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2852,9 +2852,9 @@ CREATE TABLE vendor_order_additional_info (
 --
 
 CREATE TABLE vendor_order_entity_required_service_info (
-    vendor_order_entity_id text NOT NULL,
-    required_service_info text,
-    required_service_info_key text NOT NULL
+    vendor_order_entity_id varchar(255) NOT NULL,
+    required_service_info varchar(255),
+    required_service_info_key varchar(255) NOT NULL
 );
 
 
@@ -2864,8 +2864,8 @@ CREATE TABLE vendor_order_entity_required_service_info (
 --
 
 CREATE TABLE vendor_order_entity_service_ids (
-    vendor_order_entity_id text NOT NULL,
-    service_ids text
+    vendor_order_entity_id varchar(255) NOT NULL,
+    service_ids varchar(255)
 );
 
 
@@ -2875,8 +2875,8 @@ CREATE TABLE vendor_order_entity_service_ids (
 --
 
 CREATE TABLE vendor_order_external_references (
-    vendor_order_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    vendor_order_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2886,17 +2886,17 @@ CREATE TABLE vendor_order_external_references (
 --
 
 CREATE TABLE vendor_spec (
-    id text NOT NULL,
-    auth_user_id text,
-    contact_name text,
-    vendor_address text,
-    vendor_city text,
-    vendor_country text,
-    vendor_description text,
-    vendor_email text,
-    vendor_name text,
-    vendor_phone text,
-    vendorurl text
+    id varchar(255) NOT NULL,
+    auth_user_id varchar(255),
+    contact_name varchar(255),
+    vendor_address varchar(255),
+    vendor_city varchar(255),
+    vendor_country varchar(255),
+    vendor_description varchar(255),
+    vendor_email varchar(255),
+    vendor_name varchar(255),
+    vendor_phone varchar(255),
+    vendorurl varchar(255)
 );
 
 
@@ -2906,8 +2906,8 @@ CREATE TABLE vendor_spec (
 --
 
 CREATE TABLE vendor_spec_additional_info (
-    vendor_spec_entity_id text NOT NULL,
-    additional_info_id text NOT NULL
+    vendor_spec_entity_id varchar(255) NOT NULL,
+    additional_info_id varchar(255) NOT NULL
 );
 
 
@@ -2917,11 +2917,11 @@ CREATE TABLE vendor_spec_additional_info (
 --
 
 CREATE TABLE vendor_spec_deliverable (
-    id text NOT NULL,
-    description text,
-    format text,
-    name text,
-    vendor_spec_platform_db_id text
+    id varchar(255) NOT NULL,
+    description varchar(255),
+    format varchar(255),
+    name varchar(255),
+    vendor_spec_platform_db_id varchar(255)
 );
 
 
@@ -2931,8 +2931,8 @@ CREATE TABLE vendor_spec_deliverable (
 --
 
 CREATE TABLE vendor_spec_external_references (
-    vendor_spec_entity_id text NOT NULL,
-    external_references_id text NOT NULL
+    vendor_spec_entity_id varchar(255) NOT NULL,
+    external_references_id varchar(255) NOT NULL
 );
 
 
@@ -2942,9 +2942,9 @@ CREATE TABLE vendor_spec_external_references (
 --
 
 CREATE TABLE vendor_spec_input_format (
-    id text NOT NULL,
-    input_format text,
-    vendor_spec_standard_requirement_db_id text
+    id varchar(255) NOT NULL,
+    input_format varchar(255),
+    vendor_spec_standard_requirement_db_id varchar(255)
 );
 
 
@@ -2954,21 +2954,21 @@ CREATE TABLE vendor_spec_input_format (
 --
 
 CREATE TABLE vendor_spec_platform (
-    id text NOT NULL,
-    contact_email text,
-    contact_name text,
-    contact_phone text,
-    platform_description text,
-    platform_name text,
-    platformurl text,
-    shipping_address text,
-    specific_requirements text,
-    taxonomy_id_system_name text,
-    taxonomy_id_systemuri text,
-    tissue_id_system_name text,
-    tissue_id_systemuri text,
-    vendor_spec_db_id text,
-    standard_requirements_id text
+    id varchar(255) NOT NULL,
+    contact_email varchar(255),
+    contact_name varchar(255),
+    contact_phone varchar(255),
+    platform_description varchar(255),
+    platform_name varchar(255),
+    platformurl varchar(255),
+    shipping_address varchar(255),
+    specific_requirements varchar(255),
+    taxonomy_id_system_name varchar(255),
+    taxonomy_id_systemuri varchar(255),
+    tissue_id_system_name varchar(255),
+    tissue_id_systemuri varchar(255),
+    vendor_spec_db_id varchar(255),
+    standard_requirements_id varchar(255)
 );
 
 
@@ -2978,15 +2978,15 @@ CREATE TABLE vendor_spec_platform (
 --
 
 CREATE TABLE vendor_spec_requirement (
-    id text NOT NULL,
-    input_format_details text,
-    max_concentration text,
-    max_volume text,
-    min_concentration text,
-    min_sample_number text,
-    min_volume text,
-    plate_orientation text,
-    sample_type_details text
+    id varchar(255) NOT NULL,
+    input_format_details varchar(255),
+    max_concentration varchar(255),
+    max_volume varchar(255),
+    min_concentration varchar(255),
+    min_sample_number varchar(255),
+    min_volume varchar(255),
+    plate_orientation varchar(255),
+    sample_type_details varchar(255)
 );
 
 
@@ -2996,9 +2996,9 @@ CREATE TABLE vendor_spec_requirement (
 --
 
 CREATE TABLE vendor_spec_sample_type (
-    id text NOT NULL,
-    sample_type text,
-    vendor_spec_standard_requirement_db_id text
+    id varchar(255) NOT NULL,
+    sample_type varchar(255),
+    vendor_spec_standard_requirement_db_id varchar(255)
 );
 
 
@@ -3008,10 +3008,10 @@ CREATE TABLE vendor_spec_sample_type (
 --
 
 CREATE TABLE vendor_spec_status (
-    id text NOT NULL,
-    status_description text,
-    status_name text,
-    vendor_spec_platform_db_id text
+    id varchar(255) NOT NULL,
+    status_description varchar(255),
+    status_name varchar(255),
+    vendor_spec_platform_db_id varchar(255)
 );
 
 
@@ -3021,9 +3021,9 @@ CREATE TABLE vendor_spec_status (
 --
 
 CREATE TABLE vendor_spec_well_position (
-    id text NOT NULL,
-    "position" text,
-    vendor_spec_standard_requirement_db_id text
+    id varchar(255) NOT NULL,
+    "position" varchar(255),
+    vendor_spec_standard_requirement_db_id varchar(255)
 );