diff --git a/core/pom.xml b/core/pom.xml
index a92ae9f4b..9a7eda05c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-core</artifactId>
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-external</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/example/pom.xml b/example/pom.xml
index 3d72d4ffc..f71df6165 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-core</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-test</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/external/pom.xml b/external/pom.xml
index 0651e78f1..d4de49eed 100644
--- a/external/pom.xml
+++ b/external/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-external</artifactId>
diff --git a/plugin/case-reporting/pom.xml b/plugin/case-reporting/pom.xml
index 9f2188578..dfbc95405 100644
--- a/plugin/case-reporting/pom.xml
+++ b/plugin/case-reporting/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-case-reporting</artifactId>
@@ -12,7 +12,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cql</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>
diff --git a/plugin/cds-hooks/pom.xml b/plugin/cds-hooks/pom.xml
index 2ee7cbbd3..760eac697 100644
--- a/plugin/cds-hooks/pom.xml
+++ b/plugin/cds-hooks/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-cds-hooks</artifactId>
@@ -12,22 +12,22 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cql</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cr</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-security</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cpg</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/plugin/cpg/pom.xml b/plugin/cpg/pom.xml
index 27fef41d9..4329dbb6a 100644
--- a/plugin/cpg/pom.xml
+++ b/plugin/cpg/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-cpg</artifactId>
@@ -12,7 +12,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cql</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/plugin/cql/pom.xml b/plugin/cql/pom.xml
index 25a0786f6..cbbb9f5cc 100644
--- a/plugin/cql/pom.xml
+++ b/plugin/cql/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-cql</artifactId>
diff --git a/plugin/cr/pom.xml b/plugin/cr/pom.xml
index 847a6a2f7..3f909aafb 100644
--- a/plugin/cr/pom.xml
+++ b/plugin/cr/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cqf-ruler-cr</artifactId>
 	<dependencies>
@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cql</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/plugin/dev-tools/pom.xml b/plugin/dev-tools/pom.xml
index 00d75ad59..2844bbf91 100644
--- a/plugin/dev-tools/pom.xml
+++ b/plugin/dev-tools/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-dev-tools</artifactId>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 442202682..6e070c1b4 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-plugin</artifactId>
@@ -25,12 +25,12 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-core</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-external</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-test</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/plugin/ra/pom.xml b/plugin/ra/pom.xml
index 223e08ae6..f25182426 100644
--- a/plugin/ra/pom.xml
+++ b/plugin/ra/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-ra</artifactId>
@@ -12,7 +12,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cr</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/plugin/sdc/pom.xml b/plugin/sdc/pom.xml
index 217456d27..5fb4e97a6 100644
--- a/plugin/sdc/pom.xml
+++ b/plugin/sdc/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-sdc</artifactId>
diff --git a/plugin/security/pom.xml b/plugin/security/pom.xml
index ae78f0783..bad8f67cc 100644
--- a/plugin/security/pom.xml
+++ b/plugin/security/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-security</artifactId>
@@ -12,7 +12,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-dev-tools</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/pom.xml b/pom.xml
index 07d2d1d32..64c30ec3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.opencds.cqf.ruler</groupId>
 	<artifactId>cqf-ruler</artifactId>
-	<version>0.7.1</version>
+	<version>0.8.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>cqf-ruler</name>
@@ -87,12 +87,12 @@
 	</distributionManagement>
 
 	<properties>
-		<cqf-tooling.version>2.0.0</cqf-tooling.version>
+		<cqf-tooling.version>2.1.0-SNAPSHOT</cqf-tooling.version>
 
 		<!-- CQL Support -->
 		<cqframework.version>2.2.0</cqframework.version>
-		<cql-engine.version>2.1.0</cql-engine.version>
-		<cql-evaluator.version>2.1.1</cql-evaluator.version>
+		<cql-engine.version>2.2.0-SNAPSHOT</cql-engine.version>
+		<cql-evaluator.version>2.2.0-SNAPSHOT</cql-evaluator.version>
 
 		<!-- Dependency Versions -->
 		<fhir_core_version>5.6.36</fhir_core_version>
diff --git a/server/pom.xml b/server/pom.xml
index f4b814200..d7faa703d 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-server</artifactId>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-core</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -229,37 +229,37 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-case-reporting</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cds-hooks</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cpg</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cql</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cr</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-dev-tools</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
@@ -267,19 +267,19 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-ra</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-sdc</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-security</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
diff --git a/test/pom.xml b/test/pom.xml
index 20ceb00d5..e66e878b2 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler</artifactId>
-		<version>0.7.1</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cqf-ruler-test</artifactId>
@@ -102,12 +102,12 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-core</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-external</artifactId>
-			<version>0.7.1</version>
+			<version>0.8.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>