diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml
index b33763b..8447ff7 100644
--- a/controlloop/common/eventmanager/pom.xml
+++ b/controlloop/common/eventmanager/pom.xml
@@ -29,6 +29,18 @@
 	<artifactId>eventmanager</artifactId>
 	<dependencies>
 		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>org.eclipse.persistence.jpa</artifactId>
+			<version>2.7.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+	  	</dependency>
+		<dependency>
 			<groupId>org.onap.policy.drools-applications</groupId>
 			<artifactId>actorServiceProvider</artifactId>
 			<version>1.1.0-SNAPSHOT</version>
diff --git a/controlloop/common/guard/pom.xml b/controlloop/common/guard/pom.xml
index 388a233..2b173c3 100644
--- a/controlloop/common/guard/pom.xml
+++ b/controlloop/common/guard/pom.xml
@@ -7,16 +7,6 @@
 	</parent>
   <artifactId>guard</artifactId>
   <dependencies>
-	
-<!-- 
-	<dependency>
-		<groupId>org.onap.policy.drools-applications</groupId>
-		<artifactId>common</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-		<scope>provided</scope>
-	</dependency>
--->
-
 		<dependency>
 			<groupId>org.onap.policy.drools-applications</groupId>
 			<artifactId>policy-yaml</artifactId>
@@ -44,24 +34,26 @@
       	<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
+			<version>2.5</version>
+			<scope>provided</scope>
 	  	</dependency>
       	<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 			<version>4.5.2</version>
+			<scope>provided</scope>
 	  	</dependency>
 		<dependency>
 			<groupId>org.drools</groupId>
 			<artifactId>drools-core</artifactId>
-			<version>6.3.0.Final</version>
+			<version>6.5.0.Final</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.jpa</artifactId>
-            <version>2.6.4</version>
+            <version>2.7.0</version>
+			<scope>provided</scope>
         </dependency>
-		
-      
   </dependencies>
 </project>
diff --git a/controlloop/common/pom.xml b/controlloop/common/pom.xml
index f3975b9..b6db666 100644
--- a/controlloop/common/pom.xml
+++ b/controlloop/common/pom.xml
@@ -34,8 +34,8 @@
 
     <modules>
     	<module>actors</module>
-    	<module>eventmanager</module>
         <module>guard</module>
+    	<module>eventmanager</module>
         <module>model-impl</module>
     	<module>policy-yaml</module>
     </modules>
diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/__controlLoopName__.drl b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/__controlLoopName__.drl
index 1c6244c..caf7273 100644
--- a/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/__controlLoopName__.drl
+++ b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/__controlLoopName__.drl
@@ -84,7 +84,7 @@
 // These parameters are required to build the runtime policy
 //
 declare Params
-    controlLoopName : String
+    closedLoopControlName : String
     actor : String
     aaiURL : String
     aaiUsername : String
diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml
index c7451cf..989f16e 100644
--- a/controlloop/templates/template.demo/pom.xml
+++ b/controlloop/templates/template.demo/pom.xml
@@ -30,6 +30,18 @@
 	<artifactId>template.demo</artifactId>
 	<dependencies>
 		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>org.eclipse.persistence.jpa</artifactId>
+			<version>2.7.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
 			<groupId>org.drools</groupId>
 			<artifactId>drools-core</artifactId>
 			<version>6.5.0.Final</version>
@@ -147,7 +159,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
-			<scope>provided</scope>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 739998f..4d89206 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,17 +79,28 @@
 				</configuration>
 			</plugin>
 
-		<plugin>
-		  <groupId>org.apache.maven.plugins</groupId>
-		  <artifactId>maven-site-plugin</artifactId>
-		  <dependencies>
-		    <dependency>
-		      <groupId>org.apache.maven.wagon</groupId>
-		      <artifactId>wagon-webdav-jackrabbit</artifactId>
-		      <version>2.10</version>
-		    </dependency>
-		  </dependencies>
-		</plugin>
+			<plugin>
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-site-plugin</artifactId>
+			  <dependencies>
+			    <dependency>
+			      <groupId>org.apache.maven.wagon</groupId>
+			      <artifactId>wagon-webdav-jackrabbit</artifactId>
+			      <version>2.10</version>
+			    </dependency>
+			  </dependencies>
+			</plugin>
+		
+			<plugin>
+				<groupId>org.onap.oparent</groupId>
+				<artifactId>version-check-maven-plugin</artifactId>
+				<executions>
+				     <execution>
+				       <id>version-check</id>
+				       <phase/>
+				     </execution>    
+				</executions>
+			</plugin>
 
 	    </plugins>
         <pluginManagement>
@@ -165,12 +176,29 @@
 	    </plugin>
 	  </plugins>
 	</reporting>
+
 	<dependencies>
 		<dependency>
-		<groupId>ch.qos.logback</groupId>
-		<artifactId>logback-classic</artifactId>
-		<version>1.2.3</version>
-		<scope>provided</scope>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.3</version>
+			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.onap.oparent</groupId>
+			<artifactId>version-check-maven-plugin</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+			<scope>provided</scope>
+			<optional>true</optional>
+			<exclusions>
+			<exclusion>
+				<groupId>*</groupId>
+				<artifactId>*</artifactId>
+				</exclusion>
+                        </exclusions>
+                </dependency>
+
 	</dependencies>
+
+
 </project>