diff --git a/api/pom.xml b/api/pom.xml
index cfa63ab7..0564b3e2 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>appointmentscheduling</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>appointmentscheduling-api</artifactId>
diff --git a/omod/pom.xml b/omod/pom.xml
index 95b17900..06c49287 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>appointmentscheduling</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>appointmentscheduling-omod</artifactId>
@@ -13,58 +13,58 @@
 	<description>OMOD project for Appointment Scheduling</description>
 
 	<dependencies>
-
-
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>${project.parent.artifactId}-api</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
-        <!-- Begin OpenMRS Core -->
-
-
-        <dependency>
-            <groupId>org.openmrs.web</groupId>
-            <artifactId>openmrs-web</artifactId>
-            <version>${openMRSVersion}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.openmrs.web</groupId>
-            <artifactId>openmrs-web</artifactId>
-            <version>${openMRSVersion}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Begin OpenMRS modules -->
-
-        <dependency>
-            <groupId>org.openmrs.module</groupId>
-            <artifactId>webservices.rest-omod</artifactId>
-            <version>${webservicesRestVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openmrs.module</groupId>
-            <artifactId>webservices.rest-omod-common</artifactId>
-            <version>${webservicesRestVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openmrs.module</groupId>
-            <artifactId>webservices.rest-omod-common</artifactId>
-            <version>${webservicesRestVersion}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-	</dependencies>
-
+    <dependency>
+        <groupId>${project.parent.groupId}</groupId>
+        <artifactId>${project.parent.artifactId}-api</artifactId>
+        <version>${project.parent.version}</version>
+        <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+        <groupId>org.openmrs.web</groupId>
+        <artifactId>openmrs-web</artifactId>
+        <version>${openMRSVersion}</version>
+        <type>jar</type>
+        <scope>provided</scope>
+    </dependency>
+
+	<dependency>
+		<groupId>org.openmrs.api</groupId>
+		<artifactId>openmrs-api</artifactId>
+		<version>${openMRSVersion}</version>
+		<type>jar</type>
+		<scope>provided</scope>
+	</dependency>
+    
+    <dependency>
+        <groupId>org.openmrs.web</groupId>
+        <artifactId>openmrs-web</artifactId>
+        <version>${openMRSVersion}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+    </dependency>
+
+    <dependency>
+        <groupId>org.directwebremoting</groupId>
+        <artifactId>dwr</artifactId>
+        <version>2.0.5</version>
+        <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+        <groupId>org.openmrs.module</groupId>
+        <artifactId>webservices.rest-omod</artifactId>
+        <version>${webservicesRestVersion}</version>
+        <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+        <groupId>org.openmrs.module</groupId>
+        <artifactId>webservices.rest-omod-common</artifactId>
+        <version>${webservicesRestVersion}</version>
+        <scope>provided</scope>
+    </dependency>
+</dependencies>
 
 	<build>
 		<finalName>${project.parent.artifactId}-${project.parent.version}</finalName>
diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml
index 5813ad37..026a257e 100644
--- a/omod/src/main/resources/config.xml
+++ b/omod/src/main/resources/config.xml
@@ -15,11 +15,13 @@
 	<updateURL>https://dev.openmrs.org/modules/download/${project.parent.artifactId}/update.rdf
 
     </updateURL>
-	<require_version>1.11.3, 1.10.2 - 1.10.*, 1.9.9 - 1.9.*</require_version>
+	<require_version>${openMRSVersion}</require_version>
 
     <require_modules>
         <require_module version="${webservicesRestVersion}">org.openmrs.module.webservices.rest</require_module>
         <require_module version="${reportingModuleVersion}">org.openmrs.module.reporting</require_module>
+		<require_module version="${serializationxstreamVersion}">org.openmrs.module.serialization.xstream</require_module>
+		<require_module version="${htmlwidgetsVersion}">org.openmrs.module.htmlwidgets</require_module>
     </require_modules>
     
     <aware_of_modules>
@@ -76,8 +78,7 @@
     </globalProperty>
 
 	<!-- Module Activator -->
-	<activator>${project.parent.groupId}.${project.parent.artifactId}.AppointmentActivator
-	</activator>
+	<activator>org.openmrs.module.appointmentscheduling.AppointmentActivator</activator>
 
 	<dwr>
 		<allow>
diff --git a/pom.xml b/pom.xml
index 285c491d..ec654ce8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.openmrs.module</groupId>
 	<artifactId>appointmentscheduling</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Appointment Scheduling Module</name>
 	<description>Module for scheduling patient appointments and managing providers schedule</description>
@@ -47,11 +47,12 @@
 	</modules>
 	
 	<properties>
-		<openMRSVersion>1.9.9</openMRSVersion>
-		<webservicesRestVersion>2.5</webservicesRestVersion>
-		<serializationXstreamModuleVersion>0.2.7</serializationXstreamModuleVersion>
-		<calculationModuleVersion>1.0</calculationModuleVersion>
-		<reportingModuleVersion>0.9.2</reportingModuleVersion>
+		<openMRSVersion>2.5.0</openMRSVersion>
+		<webservicesRestVersion>2.46.0</webservicesRestVersion>
+		<serializationxstreamVersion>0.4.0-SNAPSHOT</serializationxstreamVersion>
+		<reportingModuleVersion>2.1.0-SNAPSHOT</reportingModuleVersion>
+		<htmlwidgetsVersion>2.0.1</htmlwidgetsVersion>
+        <calculationVersion>1.3.0</calculationVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -112,20 +113,58 @@
             <scope>provided</scope>
         </dependency>
 
+		<dependency>
+            <groupId>org.openmrs.module</groupId>
+            <artifactId>reporting-api</artifactId>
+            <version>${reportingModuleVersion}</version>
+			<type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+		<dependency>
+            <groupId>org.openmrs.module</groupId>
+            <artifactId>calculation-api</artifactId>
+            <version>${calculationVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>serialization.xstream-api</artifactId>
-            <version>${serializationXstreamModuleVersion}</version>
+            <version>${serializationxstreamVersion}</version>
             <scope>provided</scope>
         </dependency>
 
+		<dependency>
+            <groupId>org.openmrs.module</groupId>
+            <artifactId>serialization.xstream-api</artifactId>
+            <version>${serializationxstreamVersion}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>htmlwidgets-api</artifactId>
+			<version>${htmlwidgetsVersion}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>webservices.rest-omod-common</artifactId>
+			<version>${webservicesRestVersion}</version>
+			<scope>provided</scope>
+		</dependency>
+
         <dependency>
             <groupId>org.openmrs.module</groupId>
-            <artifactId>calculation-api</artifactId>
-            <version>${calculationModuleVersion}</version>
-            <scope>provided</scope>
+            <artifactId>legacyui-omod</artifactId>
+            <version>1.15.0</version> <scope>provided</scope>
         </dependency>
 
+		
+
         <!-- Other dependencies -->
         <dependency>
             <groupId>joda-time</groupId>
@@ -141,9 +180,11 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.13.0</version>
 					<configuration>
-						<target>1.6</target>
-						<source>1.6</source>
+						<target>1.8</target>
+						<source>1.8</source>
+                        <release>8</release>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -181,23 +222,15 @@
 		</pluginManagement>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>openmrs-repo</id>
-			<name>OpenMRS Nexus Repository</name>
-			<url>https://mavenrepo.openmrs.org/public</url>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>openmrs-repo</id>
-			<name>OpenMRS Nexus Repository</name>
-			<url>https://mavenrepo.openmrs.org/public</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>openmrs-repo</id>
+            <name>OpenMRS Nexus Repository</name>
+            <url>https://mavenrepo.openmrs.org/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
 
 </project>