diff --git a/archetype/generated-validator/pom.xml b/archetype/generated-validator/pom.xml
index 73c7a5b5673dab9e35fdd7ccbbaa3a9e3ce5c8fb..00e57065c259e878bac131dae3d662e8ce140e26 100644
--- a/archetype/generated-validator/pom.xml
+++ b/archetype/generated-validator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gazelle-objects-checker</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -13,7 +13,7 @@
     <groupId>net.ihe.gazelle.goc</groupId>
     <artifactId>generated-validator</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <modules>
         <module>validator-archetype-instantiator</module>
         <module>validator-archetype</module>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>net.ihe.gazelle.goctests</groupId>
             <artifactId>goc-annotations</artifactId>
-            <version>3.1.5-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/archetype/generated-validator/validator-archetype-instantiator/pom.xml b/archetype/generated-validator/validator-archetype-instantiator/pom.xml
index eea0deb24e1d4d6463d9056360f95964f3cde823..dd815933c3f1943f180e454f15a56bb49e20a07c 100644
--- a/archetype/generated-validator/validator-archetype-instantiator/pom.xml
+++ b/archetype/generated-validator/validator-archetype-instantiator/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <artifactId>generated-validator</artifactId>
         <groupId>net.ihe.gazelle.goc</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>validator-archetype-instantiator</artifactId>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
 </project>
\ No newline at end of file
diff --git a/archetype/generated-validator/validator-archetype/pom.xml b/archetype/generated-validator/validator-archetype/pom.xml
index 046974a00f6ae161c6bb757c35cf80721b6dfc55..d361cdc8621781c0171e40a1eacbca33fe2fb661 100644
--- a/archetype/generated-validator/validator-archetype/pom.xml
+++ b/archetype/generated-validator/validator-archetype/pom.xml
@@ -3,11 +3,11 @@
     <parent>
         <artifactId>generated-validator</artifactId>
         <groupId>net.ihe.gazelle.goc</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>validator-archetype</artifactId>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <build>
diff --git a/archetype/generated-validator/validator-archetype/src/main/resources/archetype-resources/pom.xml b/archetype/generated-validator/validator-archetype/src/main/resources/archetype-resources/pom.xml
index 06d0918aa2b8ba65047c7133100a9180cbac4233..b46890b72ac5d00b9324f0bd6f2e16fd7233d676 100644
--- a/archetype/generated-validator/validator-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/generated-validator/validator-archetype/src/main/resources/archetype-resources/pom.xml
@@ -207,7 +207,7 @@
             <groupId>net.ihe.gazelle.cdaxehealth</groupId>
             <artifactId>cdaxehealth-code-jar</artifactId>
             <type>jar</type>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/hl7templates/goc-tests/goc-annotations/pom.xml b/hl7templates/goc-tests/goc-annotations/pom.xml
index e7f87cf02a73ccfe1263aeff6d9c1f5cd84ec5ba..e38c23b648f58bc676f753da993434b60b2f413b 100644
--- a/hl7templates/goc-tests/goc-annotations/pom.xml
+++ b/hl7templates/goc-tests/goc-annotations/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>goc-tests</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <groupId>net.ihe.gazelle.goctests</groupId>
     <artifactId>goc-annotations</artifactId>
     <name>GOC Annotations</name>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
 
     <build>
diff --git a/hl7templates/goc-tests/goc-tests-runner/pom.xml b/hl7templates/goc-tests/goc-tests-runner/pom.xml
index 39eae9f8da966fd5e7bb712f4d9df4b7ccb686fd..6b09252449a64c30c5f864f4b64923065f0021f9 100644
--- a/hl7templates/goc-tests/goc-tests-runner/pom.xml
+++ b/hl7templates/goc-tests/goc-tests-runner/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>goc-tests</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <groupId>net.ihe.gazelle.goctests</groupId>
     <artifactId>goc-tests-runner</artifactId>
     <name>GOC Tests Runner</name>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
 
     <build>
@@ -110,7 +110,7 @@
         <dependency>
             <groupId>net.ihe.gazelle</groupId>
             <artifactId>hl7templates-packager-jar</artifactId>
-            <version>3.1.5-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/hl7templates/goc-tests/pom.xml b/hl7templates/goc-tests/pom.xml
index 01754963a397922c552891b8991535b002ab7abb..2489d7726f22294387fe71f1b34dacd623c692bd 100644
--- a/hl7templates/goc-tests/pom.xml
+++ b/hl7templates/goc-tests/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>gazelle-objects-checker</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>goc-tests</artifactId>
     <name>GOC Tests</name>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
diff --git a/hl7templates/gocmodel-jar/pom.xml b/hl7templates/gocmodel-jar/pom.xml
index c84a66e779212ce67d2f9bc5f48ecf34050bc8a7..bcaa2856f2e1a70a7b13458b6f06aa87b6397eaf 100644
--- a/hl7templates/gocmodel-jar/pom.xml
+++ b/hl7templates/gocmodel-jar/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>gazelle-objects-checker</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>gocmodel-jar</artifactId>
     <name>GOC Model JAR</name>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <organization>
         <name>IHE-Europe</name>
@@ -342,7 +342,7 @@
         <dependency>
             <groupId>net.ihe.gazelle.goctests</groupId>
             <artifactId>goc-annotations</artifactId>
-            <version>3.1.5-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/hl7templates/hl7templates-api-jar/pom.xml b/hl7templates/hl7templates-api-jar/pom.xml
index 51418faf369995ffe8616f4b4b98a68f3b7ea841..9ec0a83f5112b3e583088d097e10b62bf34e2a4a 100644
--- a/hl7templates/hl7templates-api-jar/pom.xml
+++ b/hl7templates/hl7templates-api-jar/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>gazelle-objects-checker</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>hl7templates-api-jar</artifactId>
     <name>HL7Templates API JAR</name>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <organization>
         <name>IHE-Europe</name>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>net.ihe.gazelle</groupId>
             <artifactId>hl7templates-model-jar</artifactId>
-            <version>3.1.5-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/hl7templates/hl7templates-generator-jar/pom.xml b/hl7templates/hl7templates-generator-jar/pom.xml
index 0b4cd0b5bfddaac9fbac29032d3f7dcafa2c507e..39fef5cb6fd164b3adc862380637b37b19b79c7c 100644
--- a/hl7templates/hl7templates-generator-jar/pom.xml
+++ b/hl7templates/hl7templates-generator-jar/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>gazelle-objects-checker</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>hl7templates-generator-jar</artifactId>
     <name>HL7Templates Generator JAR</name>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
 
     <organization>
@@ -143,7 +143,7 @@
                     <dependency>
                         <groupId>net.ihe.gazelle</groupId>
                         <artifactId>gocmodel-jar</artifactId>
-                        <version>3.1.5-SNAPSHOT</version>
+                        <version>3.2.0-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -238,7 +238,7 @@
         <dependency>
             <groupId>net.ihe.gazelle</groupId>
             <artifactId>hl7templates-model-jar</artifactId>
-            <version>3.1.5-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -249,7 +249,7 @@
         <dependency>
             <groupId>net.ihe.gazelle</groupId>
             <artifactId>hl7templates-api-jar</artifactId>
-            <version>3.1.5-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>net.ihe.gazelle.svs</groupId>
diff --git a/hl7templates/hl7templates-model-jar/pom.xml b/hl7templates/hl7templates-model-jar/pom.xml
index 4cfa8912b53c36adf54b5cf5ab7762d2af710da0..74effe55105a7b06083bf0292784bbbf1942c1c3 100644
--- a/hl7templates/hl7templates-model-jar/pom.xml
+++ b/hl7templates/hl7templates-model-jar/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>gazelle-objects-checker</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>hl7templates-model-jar</artifactId>
     <name>HL7Templates Model JAR</name>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <organization>
         <name>IHE-Europe</name>
@@ -134,7 +134,7 @@
                     <dependency>
                         <groupId>net.ihe.gazelle</groupId>
                         <artifactId>gocmodel-jar</artifactId>
-                        <version>3.1.5-SNAPSHOT</version>
+                        <version>3.2.0-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -214,7 +214,7 @@
         <dependency>
             <groupId>net.ihe.gazelle</groupId>
             <artifactId>gocmodel-jar</artifactId>
-            <version>3.1.5-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/hl7templates/hl7templates-packager-jar/pom.xml b/hl7templates/hl7templates-packager-jar/pom.xml
index d4c0d5be0c69714774e75a8c0cd8bca533c7918f..b19fe5c0e6dc8c5269fd6eade94d3d7f80931c10 100644
--- a/hl7templates/hl7templates-packager-jar/pom.xml
+++ b/hl7templates/hl7templates-packager-jar/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>gazelle-objects-checker</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>3.1.5-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>hl7templates-packager-jar</artifactId>
     <name>HL7 Templates Packager</name>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <organization>
         <name>IHE europe</name>
@@ -164,7 +164,7 @@
         <dependency>
             <groupId>net.ihe.gazelle</groupId>
             <artifactId>hl7templates-generator-jar</artifactId>
-            <version>3.1.5-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -211,7 +211,7 @@
         <dependency>
             <groupId>net.ihe.gazelle.goc</groupId>
             <artifactId>validator-archetype-instantiator</artifactId>
-            <version>3.1.5-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
             <type>jar</type>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index 90b757c909431140745b62a75ab4ebebc1744fa8..4ad0756b5320a2913263732f83084efb8cbc80d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>gazelle-objects-checker</artifactId>
     <name>Gazelle Objects Checker</name>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <organization>
@@ -26,14 +26,14 @@
         <nexus.staging.maven.plugin.version>1.6.8</nexus.staging.maven.plugin.version>
         <sonar.maven.plugin>3.5.0.1254</sonar.maven.plugin>
         <jacoco.version>0.8.7</jacoco.version>
-        <uml-models.version>3.1.2-SNAPSHOT</uml-models.version>
+        <uml-models.version>3.2.0</uml-models.version>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>net.ihe.gazelle</groupId>
                 <artifactId>uml-models</artifactId>
-                <version>3.1.2-SNAPSHOT</version>
+                <version>3.2.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>