diff --git a/cqf-fhir-api/pom.xml b/cqf-fhir-api/pom.xml
index c60a2fa5a..28f653192 100644
--- a/cqf-fhir-api/pom.xml
+++ b/cqf-fhir-api/pom.xml
@@ -5,14 +5,14 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-api</artifactId>
-  <version>3.16.0-SNAPSHOT</version>
+  <version>3.16.0</version>
   <name>FHIR Clinical Reasoning (APIs)</name>
   <description>FHIR Repository APIs used by this project. Implement these to incorporate clinical reasoning on your platform</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
   </parent>
 
   <dependencies>
diff --git a/cqf-fhir-benchmark/pom.xml b/cqf-fhir-benchmark/pom.xml
index 11ac44ff0..038f07bc8 100644
--- a/cqf-fhir-benchmark/pom.xml
+++ b/cqf-fhir-benchmark/pom.xml
@@ -5,26 +5,26 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-benchmark</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
     <name>FHIR Clinical Reasoning (Benchmarks)</name>
     <description>Tests validating performance of FHIR Clinical Reasoning operations</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.16.0-SNAPSHOT</version>
+            <version>3.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-test</artifactId>
-            <version>3.16.0-SNAPSHOT</version>
+            <version>3.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -34,14 +34,14 @@
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.16.0-SNAPSHOT</version>
+            <version>3.16.0</version>
             <!--TODO: test-jars don't seem to work very well. Need to investigate some alternatives -->
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-jackson</artifactId>
-            <version>3.16.0-SNAPSHOT</version>
+            <version>3.16.0</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
diff --git a/cqf-fhir-bom/pom.xml b/cqf-fhir-bom/pom.xml
index e65d6b944..ff1d7189b 100644
--- a/cqf-fhir-bom/pom.xml
+++ b/cqf-fhir-bom/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-bom</artifactId>
-  <version>3.16.0-SNAPSHOT</version>
+  <version>3.16.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (Bill Of Materials)</name>
   <description>This bom can be used to simplify dependency management when using this project</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
   </parent>
 
   <dependencyManagement>
@@ -21,44 +21,44 @@
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-api</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-test</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-utility</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cql</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-jackson</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-jaxb</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cr</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cr-cli</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/cqf-fhir-cql/pom.xml b/cqf-fhir-cql/pom.xml
index 2d7df89f6..c2207cf9f 100644
--- a/cqf-fhir-cql/pom.xml
+++ b/cqf-fhir-cql/pom.xml
@@ -5,26 +5,26 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-cql</artifactId>
-  <version>3.16.0-SNAPSHOT</version>
+  <version>3.16.0</version>
   <name>FHIR Clinical Reasoning (CQL)</name>
   <description>Tools, utilities, code gen to support CQL in FHIR Clinical Reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-utility</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -62,13 +62,13 @@
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-test</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-jackson</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>
diff --git a/cqf-fhir-cr-cli/pom.xml b/cqf-fhir-cr-cli/pom.xml
index c9ae68ac2..2df6d29c4 100644
--- a/cqf-fhir-cr-cli/pom.xml
+++ b/cqf-fhir-cr-cli/pom.xml
@@ -6,36 +6,36 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-cr-cli</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
     <name>FHIR Clinical Reasoning (CLI)</name>
     <description>CLI for running FHIR Clincial Reasoning operations</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-api</artifactId>
-            <version>3.16.0-SNAPSHOT</version>
+            <version>3.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-utility</artifactId>
-            <version>3.16.0-SNAPSHOT</version>
+            <version>3.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cql</artifactId>
-            <version>3.16.0-SNAPSHOT</version>
+            <version>3.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-jackson</artifactId>
-            <version>3.16.0-SNAPSHOT</version>
+            <version>3.16.0</version>
             <type>pom</type>
         </dependency>
         <dependency>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-test</artifactId>
-            <version>3.16.0-SNAPSHOT</version>
+            <version>3.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/cqf-fhir-cr-spring/pom.xml b/cqf-fhir-cr-spring/pom.xml
index daab50a30..106f639fe 100644
--- a/cqf-fhir-cr-spring/pom.xml
+++ b/cqf-fhir-cr-spring/pom.xml
@@ -7,21 +7,21 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-cr-spring</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
     <name>FHIR Clinical Reasoning (Spring)</name>
     <description>Spring configurations for FHIR Clinical Reasoning</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.16.0-SNAPSHOT</version>
+            <version>3.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/cqf-fhir-cr/pom.xml b/cqf-fhir-cr/pom.xml
index b6085b044..312f2b45d 100644
--- a/cqf-fhir-cr/pom.xml
+++ b/cqf-fhir-cr/pom.xml
@@ -5,45 +5,45 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-cr</artifactId>
-  <version>3.16.0-SNAPSHOT</version>
+  <version>3.16.0</version>
   <name>FHIR Clinical Reasoning (Operations)</name>
   <description>Implementations of clinical reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-cql</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-utility</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
     </dependency>
 
     <!-- test dependencies-->
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-jackson</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-test</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/cqf-fhir-jackson/pom.xml b/cqf-fhir-jackson/pom.xml
index 937436694..a20369847 100644
--- a/cqf-fhir-jackson/pom.xml
+++ b/cqf-fhir-jackson/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-jackson</artifactId>
-  <version>3.16.0-SNAPSHOT</version>
+  <version>3.16.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (Jackson)</name>
   <description>Aggregator module for Jackson dependencies</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
   </parent>
 
   <dependencies>
diff --git a/cqf-fhir-jaxb/pom.xml b/cqf-fhir-jaxb/pom.xml
index 8de543dc2..236dbca83 100644
--- a/cqf-fhir-jaxb/pom.xml
+++ b/cqf-fhir-jaxb/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-jaxb</artifactId>
-  <version>3.16.0-SNAPSHOT</version>
+  <version>3.16.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (JAXB)</name>
   <description>Aggregator module for JAXB dependencies</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
   </parent>
 
   <dependencies>
diff --git a/cqf-fhir-test/pom.xml b/cqf-fhir-test/pom.xml
index 5d858469c..3b820ebc8 100644
--- a/cqf-fhir-test/pom.xml
+++ b/cqf-fhir-test/pom.xml
@@ -5,21 +5,21 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-test</artifactId>
-  <version>3.16.0-SNAPSHOT</version>
+  <version>3.16.0</version>
   <name>FHIR Clinical Reasoning (Test Utilities)</name>
   <description>Utilities to support unit testing clinical reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
     </dependency>
     <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
diff --git a/cqf-fhir-utility/pom.xml b/cqf-fhir-utility/pom.xml
index 5bcca386f..833bfbfcb 100644
--- a/cqf-fhir-utility/pom.xml
+++ b/cqf-fhir-utility/pom.xml
@@ -5,21 +5,21 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-utility</artifactId>
-  <version>3.16.0-SNAPSHOT</version>
+  <version>3.16.0</version>
   <name>FHIR Clinical Reasoning (Utilities)</name>
   <description>Utilities to help develop clinical reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.16.0-SNAPSHOT</version>
+      <version>3.16.0</version>
     </dependency>
     <dependency>
       <groupId>info.cqframework</groupId>
@@ -89,7 +89,7 @@
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-test</artifactId>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/SearchHelper.java b/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/SearchHelper.java
index 02112bc21..40fde4dea 100644
--- a/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/SearchHelper.java
+++ b/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/SearchHelper.java
@@ -131,7 +131,6 @@ public static <CanonicalType extends IPrimitiveType<String>> Class<? extends IBa
      * If no extension is present, the type of the canonical is assumed to be CodeSystem, on
      * the grounds that most (if not all) non-conventional URLs are for CodeSystem uris.
      *
-     * @param <CanonicalType>
      * @param repository the repository to search
      * @param dependencyInfo the canonical url to search for
      * @return
diff --git a/docs/pom.xml b/docs/pom.xml
index b0aedfb56..5b8cc78b2 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>docs</artifactId>
-  <version>3.16.0-SNAPSHOT</version>
+  <version>3.16.0</version>
 
   <name>FHIR Clinical Reasoning (Documentation)</name>
   <description>Documentation website for FHIR Clinical Reasoning</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
   </parent>
 
   <dependencyManagement>
@@ -23,7 +23,7 @@
         <artifactId>cqf-fhir-bom</artifactId>
         <type>pom</type>
         <scope>import</scope>
-        <version>3.16.0-SNAPSHOT</version>
+        <version>3.16.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 1d6dfb11a..52dbb19fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.16.0-SNAPSHOT</version>
+    <version>3.16.0</version>
     <packaging>pom</packaging>
     <name>FHIR Clinical Reasoning</name>
     <description>FHIR Clinical Reasoning Implementations</description>
@@ -22,7 +22,7 @@
 
         <junit.version>5.10.2</junit.version>
         <slf4j.version>2.0.4</slf4j.version>
-        <cql.version>3.19.1</cql.version>
+        <cql.version>3.20.0</cql.version>
         <jmh.version>1.36</jmh.version>
         <spring.version>6.1.14</spring.version>
         <hapi.version>7.4.5</hapi.version>