diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptDesignation.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptDesignation.java
index ae6d5d16910..0bdaa4ad492 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptDesignation.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptDesignation.java
@@ -38,15 +38,15 @@ public class TermConceptDesignation implements Serializable {
 	@GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_CONCEPT_DESIG_PID")
 	@Column(name = "PID")
 	private Long myId;
-	@Column(name = "LANG", length = 50, nullable = true)
+	@Column(name = "LANG", length = 500, nullable = true)
 	private String myLanguage;
-	@Column(name = "USE_SYSTEM", length = 50, nullable = true)
+	@Column(name = "USE_SYSTEM", length = 500, nullable = true)
 	private String myUseSystem;
-	@Column(name = "USE_CODE", length = 50, nullable = true)
+	@Column(name = "USE_CODE", length = 500, nullable = true)
 	private String myUseCode;
-	@Column(name = "USE_DISPLAY", length = 50, nullable = true)
+	@Column(name = "USE_DISPLAY", length = 500, nullable = true)
 	private String myUseDisplay;
-	@Column(name = "VAL", length = 50, nullable = false)
+	@Column(name = "VAL", length = 500, nullable = false)
 	private String myValue;
 
 	public String getLanguage() {
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptProperty.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptProperty.java
index 852141838eb..71f8c985d9d 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptProperty.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptProperty.java
@@ -43,22 +43,22 @@ public class TermConceptProperty implements Serializable {
 	@GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_CONCEPT_PROP_PID")
 	@Column(name = "PID")
 	private Long myId;
-	@Column(name = "PROP_KEY", length = 200, nullable = false)
+	@Column(name = "PROP_KEY", length = 500, nullable = false)
 	@NotBlank
 	private String myKey;
-	@Column(name = "PROP_VAL", length = 200, nullable = true)
+	@Column(name = "PROP_VAL", length = 500, nullable = true)
 	private String myValue;
 	@Column(name = "PROP_TYPE", length = MAX_PROPTYPE_ENUM_LENGTH, nullable = false)
 	private TermConceptPropertyTypeEnum myType;
 	/**
 	 * Relevant only for properties of type {@link TermConceptPropertyTypeEnum#CODING}
 	 */
-	@Column(name = "PROP_CODESYSTEM", length = 200, nullable = true)
+	@Column(name = "PROP_CODESYSTEM", length = 500, nullable = true)
 	private String myCodeSystem;
 	/**
 	 * Relevant only for properties of type {@link TermConceptPropertyTypeEnum#CODING}
 	 */
-	@Column(name = "PROP_DISPLAY", length = 200, nullable = true)
+	@Column(name = "PROP_DISPLAY", length = 500, nullable = true)
 	private String myDisplay;
 
 	/**