diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7d2a10d..43093c6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,14 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="bc1623ef-1680-428e-82bc-68bd4520dcad" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/ms-order-service-0.8.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ms-order-service-0.8.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pacts/OrderService-PaymentService.json" beforeDir="false" afterPath="$PROJECT_DIR$/pacts/OrderService-PaymentService.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/fusion/water/order/OrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/fusion/water/order/OrderService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/io/fusion/water/order/server/ServiceHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/fusion/water/order/server/ServiceHelp.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/app.props.build" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/app.props.build" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/app.props.tmpl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/app.props.tmpl" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/pacts/OrderService-PaymentService.json b/pacts/OrderService-PaymentService.json
index 7348f57..60b0fb2 100644
--- a/pacts/OrderService-PaymentService.json
+++ b/pacts/OrderService-PaymentService.json
@@ -16,8 +16,8 @@
         "status": 200,
         "body": {
           "wordData": "Jane",
-          "responseTime": "2021-08-10T23:47:02.424",
-          "dayOftheYear": 222,
+          "responseTime": "2021-08-11T02:20:46.219",
+          "dayOftheYear": 223,
           "greetings": "Good Morning Jane"
         }
       },
@@ -40,8 +40,8 @@
         "status": 200,
         "body": {
           "wordData": "Jane",
-          "responseTime": "2021-08-10T23:47:04.239",
-          "dayOftheYear": 222,
+          "responseTime": "2021-08-11T02:20:48.274",
+          "dayOftheYear": 223,
           "greetings": "Good Morning Jane"
         }
       },
diff --git a/pom.0.9.0.xml b/pom.0.9.0.xml
new file mode 100644
index 0000000..740512f
--- /dev/null
+++ b/pom.0.9.0.xml
@@ -0,0 +1,580 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>io.fusion.water.order</groupId>
+	<artifactId>ms-order-service</artifactId>
+	<version>0.9.0</version>
+	<packaging>jar</packaging>
+	<name>msOrderService</name>
+	<description>Order Microservice With Test Case Automation</description>
+
+	<!-- ================================================================= -->
+	<!-- Properties / Versions -->
+	<!-- ================================================================= -->
+	<properties>
+		<!-- Utilities -->
+		<slf4j.version>1.7.30</slf4j.version>
+		<logback.version>1.2.3</logback.version>
+		<google.gson.version>2.8.7</google.gson.version>
+		<google.guava.version>30.1.1-jre</google.guava.version>
+		<apache.commons.version>3.12.0</apache.commons.version>
+		<fasterxml.version>2.13.0-rc1</fasterxml.version>
+		<!-- Open API v3 - Swagger UI -->	
+		<openapi.version>1.5.10</openapi.version>
+			
+		<!-- Encoding -->
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		
+		<!-- Java Version -->
+		<java.version>1.8</java.version>
+		      
+		<!-- Maven -->
+		<maven.compiler.target>${java.version}</maven.compiler.target>
+		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+		<!-- 
+		<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+		 -->
+		
+		<!-- Testing Frameworks -->
+		<junit.jupiter.version>5.7.2</junit.jupiter.version>
+		<hamcrest.version>2.2</hamcrest.version>
+		<truth.version>1.0.1</truth.version>
+		<mockito.version>3.11.2</mockito.version>
+		<wiremock.version>2.29.1</wiremock.version>
+		<cucumber.version>6.10.4</cucumber.version>		
+		<selenium.version>4.0.0-beta-4</selenium.version>
+		<pact.version>4.0.10</pact.version>
+		<assertj.version>3.20.2</assertj.version>
+		
+		<!-- Spring Boot -->
+		<spring.boot.version>2.5.3</spring.boot.version>
+	</properties>
+	
+	<!-- ================================================================= -->
+	<!-- Repositories -->
+	<!-- ================================================================= -->
+	<repositories>
+		<repository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+
+		</repository>
+		<repository>
+			<id>public</id>
+			<url>http://maven.nuxeo.org/nexus/content/repositories/public/</url>
+		</repository>
+	</repositories>
+	
+	<dependencies>
+		<!-- ================================================================= -->
+		<!-- Log Framework -->
+		<!-- ================================================================= -->
+	    <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        
+        <!-- ================================================================= -->
+		<!-- Utility Libraries -->
+		<!-- ================================================================= -->
+        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
+		<dependency>
+		    <groupId>com.google.code.gson</groupId>
+		    <artifactId>gson</artifactId>
+		    <version>${google.gson.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+		<dependency>
+		    <groupId>com.google.guava</groupId>
+		    <artifactId>guava</artifactId>
+		    <version>${google.guava.version}</version>
+		</dependency>
+		
+        <!-- Used for StringUtils helper -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>${apache.commons.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${fasterxml.version}</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+		<dependency>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-databind</artifactId>
+		    <version>${fasterxml.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
+		<dependency>
+		    <groupId>com.fasterxml.jackson.datatype</groupId>
+		    <artifactId>jackson-datatype-jsr310</artifactId>
+		    <version>${fasterxml.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8 -->
+		<dependency>
+		    <groupId>com.fasterxml.jackson.datatype</groupId>
+		    <artifactId>jackson-datatype-jdk8</artifactId>
+		    <version>${fasterxml.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider -->
+		<dependency>
+		    <groupId>com.fasterxml.jackson.jaxrs</groupId>
+		    <artifactId>jackson-jaxrs-json-provider</artifactId>
+		    <version>${fasterxml.version}</version>
+		</dependency>
+		
+		<!-- UNIT TESTING ==================================================== -->
+		
+ 		<!-- ================================================================= -->
+ 		<!-- JUnit 5 Framework -->
+ 		<!-- ================================================================= -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<!-- Version defined in the Properties  -->
+			<version>${junit.jupiter.version}</version>
+			<!-- Junit Dependencies are ONLY Part of test Scope
+				 it wont be there in your build.
+			 -->
+			<scope>test</scope>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
+		<dependency>
+		    <groupId>org.junit.jupiter</groupId>
+		    <artifactId>junit-jupiter-api</artifactId>
+			<version>${junit.jupiter.version}</version>
+		    <scope>test</scope>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
+		<dependency>
+		    <groupId>org.junit.jupiter</groupId>
+		    <artifactId>junit-jupiter-engine</artifactId>
+			<version>${junit.jupiter.version}</version>
+		    <scope>test</scope>
+		</dependency>
+
+		<dependency>
+		    <groupId>org.junit.vintage</groupId>
+		    <artifactId>junit-vintage-engine</artifactId>
+		    <version>${junit.jupiter.version}</version>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+		   <groupId>org.junit.jupiter</groupId>
+		   <artifactId>junit-jupiter-migrationsupport</artifactId>
+		   <version>${junit.jupiter.version}</version>
+		   <scope>test</scope>
+		</dependency>
+	    <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+		<!-- JUnit External Modules -->
+		<dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>${hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.truth</groupId>
+            <artifactId>truth</artifactId>
+            <version>${truth.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${assertj.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- COMPONENT / CONTRACT TESTING ==================================== -->
+		     		
+		<!-- ================================================================= -->       
+        <!-- Cucumber Framework -->
+		<!-- ================================================================= -->
+		
+		<!-- https://mvnrepository.com/artifact/io.cucumber/cucumber-java -->
+		<dependency>
+		    <groupId>io.cucumber</groupId>
+		    <artifactId>cucumber-java</artifactId>
+		    <version>${cucumber.version}</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/io.cucumber/cucumber-junit -->
+		<dependency>
+		    <groupId>io.cucumber</groupId>
+		    <artifactId>cucumber-junit</artifactId>
+		    <version>${cucumber.version}</version>
+		   <!--  <scope>test</scope> -->
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/io.cucumber/cucumber-core -->
+		<dependency>
+		    <groupId>io.cucumber</groupId>
+		    <artifactId>cucumber-core</artifactId>
+		    <version>${cucumber.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/io.cucumber/cucumber-java8 -->
+		<dependency>
+		    <groupId>io.cucumber</groupId>
+		    <artifactId>cucumber-java8</artifactId>
+		    <version>${cucumber.version}</version>
+		</dependency>
+
+       <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>cucumber-junit-platform-engine</artifactId>
+            <version>${cucumber.version}</version>
+            <scope>test</scope>
+        </dependency>	
+        
+        <!-- https://mvnrepository.com/artifact/io.cucumber/cucumber-picocontainer -->
+		<dependency>
+		    <groupId>io.cucumber</groupId>
+		    <artifactId>cucumber-picocontainer</artifactId>
+            <version>${cucumber.version}</version>
+		    <scope>test</scope>
+		</dependency>
+        	
+        <!-- ================================================================= -->
+		<!-- Selenium Framework -->
+		<!-- ================================================================= -->
+		
+        <!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java -->
+		<dependency>
+		    <groupId>org.seleniumhq.selenium</groupId>
+		    <artifactId>selenium-java</artifactId>
+            <version>${selenium.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-api -->
+		<dependency>
+		    <groupId>org.seleniumhq.selenium</groupId>
+		    <artifactId>selenium-api</artifactId>
+            <version>${selenium.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-support -->
+		<dependency>
+		    <groupId>org.seleniumhq.selenium</groupId>
+		    <artifactId>selenium-support</artifactId>
+            <version>${selenium.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/io.github.bonigarcia/webdrivermanager -->
+		<dependency>
+		    <groupId>io.github.bonigarcia</groupId>
+		    <artifactId>webdrivermanager</artifactId>
+		    <version>4.4.3</version>
+		</dependency>
+
+		<!-- ================================================================= -->       
+        <!-- Mockito Framework -->
+		<!-- ================================================================= -->
+        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
+		<dependency>
+		    <groupId>org.mockito</groupId>
+		    <artifactId>mockito-core</artifactId>
+		    <version>${mockito.version}</version>
+		    <scope>test</scope>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter -->
+		<dependency>
+		    <groupId>org.mockito</groupId>
+		    <artifactId>mockito-junit-jupiter</artifactId>
+		    <version>${mockito.version}</version>
+		    <scope>test</scope>
+		</dependency>
+
+		<!-- INTEGRATION / CONTRACT TESTING ================================== -->
+
+		<!-- ================================================================= -->
+		<!-- Spring Boot Testing Framework -->
+		<!-- ================================================================= -->
+
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-test -->
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-test</artifactId>
+		    <version>${spring.boot.version}</version>
+		    <scope>test</scope>
+		    <!-- Exclude JUnit as Spring Boot Starter Test uses JUnit 4 -->
+			<exclusions>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- ================================================================= -->       
+        <!-- WireMock Framework -->
+		<!-- ================================================================= -->
+		
+		<!-- https://mvnrepository.com/artifact/com.github.tomakehurst/wiremock-jre8 -->
+		<dependency>
+		    <groupId>com.github.tomakehurst</groupId>
+		    <artifactId>wiremock-jre8</artifactId>
+		    <version>${wiremock.version}</version>
+		    <scope>test</scope>
+		</dependency>
+
+		<!-- ================================================================= -->
+		<!-- Pact Framework -->
+		<!-- ================================================================= -->
+		
+		<dependency>
+		    <groupId>au.com.dius</groupId>
+		    <artifactId>pact-jvm-provider-junit5</artifactId>
+		    <version>${pact.version}</version>
+		    <scope>test</scope>
+		</dependency>
+		
+		<dependency>
+		    <groupId>au.com.dius</groupId>
+		    <artifactId>pact-jvm-consumer-junit5</artifactId>
+		    <version>${pact.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/au.com.dius/pact-jvm-provider -->
+		<dependency>
+		    <groupId>au.com.dius</groupId>
+		    <artifactId>pact-jvm-provider</artifactId>
+            <version>${pact.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/au.com.dius/pact-jvm-consumer-junit -->
+		<dependency>
+		    <groupId>au.com.dius</groupId>
+		    <artifactId>pact-jvm-consumer-junit</artifactId>
+            <version>${pact.version}</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/au.com.dius/pact-jvm-consumer -->
+		<dependency>
+		    <groupId>au.com.dius</groupId>
+		    <artifactId>pact-jvm-consumer</artifactId>
+            <version>${pact.version}</version>
+		</dependency>
+		
+		<!-- ================================================================= -->
+		<!-- Spring Framework -->
+		<!-- ================================================================= -->
+		
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-parent -->
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-parent</artifactId>
+		    <version>${spring.boot.version}</version>
+		    <type>pom</type>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot -->
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot</artifactId>
+		    <version>${spring.boot.version}</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-web</artifactId>
+		    <version>${spring.boot.version}</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web-services -->
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-web-services</artifactId>
+		    <version>${spring.boot.version}</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-websocket -->
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-websocket</artifactId>
+		    <version>${spring.boot.version}</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-webflux -->
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-webflux</artifactId>
+		  	<version>${spring.boot.version}</version>
+		</dependency>
+
+		<!-- ================================================================= -->
+		<!-- Database Framework: H2 / MongoDB -->
+		<!-- ================================================================= -->
+		
+		<!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
+		<dependency>
+		    <groupId>com.h2database</groupId>
+		    <artifactId>h2</artifactId>
+		    <version>1.4.200</version>
+		    <scope>test</scope>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-mongodb -->
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-data-mongodb</artifactId>
+		    <version>${spring.boot.version}</version>
+		</dependency>
+     
+		<dependency>
+            <groupId>com.github.cloudyrock.mongock</groupId>
+            <artifactId>mongock-spring-v5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.cloudyrock.mongock</groupId>
+            <artifactId>mongodb-springdata-v3-driver</artifactId>
+        </dependency>
+        
+        <!-- ================================================================= -->
+		<!-- Security - Spring Security / JWT -->
+		<!-- ================================================================= -->
+		    
+        <!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt -->
+		<dependency>
+		    <groupId>io.jsonwebtoken</groupId>
+		    <artifactId>jjwt</artifactId>
+		    <version>0.9.1</version>
+		</dependency>
+		
+		<!-- 
+		This enables a default Auth Page for the Spring Boot App.
+		Default loginId: user
+		Password: will be printed in the console.
+		-->
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-security -->
+		<!--
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-security</artifactId>
+		    <version>${spring.boot.version}</version>
+		</dependency>
+		-->
+		
+        
+        <!-- ================================================================= -->
+		<!-- API Docs - Open API v3.0 (Swagger 3) -->
+		<!-- ================================================================= -->
+		
+		<dependency>
+	      <groupId>org.springdoc</groupId>
+	      <artifactId>springdoc-openapi-ui</artifactId>
+	      <version>${openapi.version}</version>
+	   	</dependency>
+
+	</dependencies>   
+	
+	<!-- ================================================================= -->
+	<!-- Dependency Management -->
+	<!-- ================================================================= -->
+	 
+	<dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.github.cloudyrock.mongock</groupId>
+                <artifactId>mongock-bom</artifactId>
+                <version>4.3.8</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+   	<!-- ================================================================= -->
+	<!-- BUILD the Service -->
+	<!-- ================================================================= -->
+	
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <!--Use this only when using Java 9+
+                    <release>15</release>
+                    -->
+                    <!--
+                    comment this (if you are using Java 9+)
+                    and Uncomment out <release> when using Java +
+                    -->
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>${spring.boot.version}</version>
+			</plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+				<!-- 
+					Filter out Test Cases 
+					All test cases with the tag mentioned in excludedGroups
+					will be filtered out.
+					Tags for Filtering
+					All (runs All Test Cases)
+					Cucumber (Runs Cucumber Test Cases)
+					JUnit (Runs JUnit Test Cases)
+					Mockito (Runs Mockito Test Cases)
+					WireMock (Runs WireMock Test Cases)
+					Pact  (Runs Pact Test Cases)
+					Selenium  (Runs Selenium Test Cases)
+					SpringBoot (Runs SpringBoot Test Cases)
+				-->	
+                <configuration>
+                    <groups>Pact</groups>
+                    <excludedGroups></excludedGroups>
+                    <!-- to be used with Pact and JUnit 5 -->
+                    <useSystemClassLoader>false</useSystemClassLoader>
+					<systemPropertyVariables>
+						<pact.rootDir>pacts</pact.rootDir>
+					</systemPropertyVariables>
+                </configuration>
+								
+            </plugin>
+
+        </plugins>
+    </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 740512f..53e4321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.fusion.water.order</groupId>
 	<artifactId>ms-order-service</artifactId>
-	<version>0.9.0</version>
+	<version>0.9.1</version>
 	<packaging>jar</packaging>
 	<name>msOrderService</name>
 	<description>Order Microservice With Test Case Automation</description>
@@ -539,12 +539,56 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
+			<!-- SpringBoot Jar (Single Jar) -->
             <plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<version>${spring.boot.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+						<configuration>
+							<classifier>spring-boot</classifier>
+							<mainClass>io.fusion.water.order.OrderService</mainClass>
+							<excludeGroupIds>test.fusion.water.order</excludeGroupIds>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- Maven Jar Pluggin with dependencies in libs folder -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.directory}/libs
+							</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>libs/</classpathPrefix>
+							<mainClass>io.fusion.water.order.OrderService</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
 			</plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/src/main/java/io/fusion/water/order/server/ServiceHelp.java b/src/main/java/io/fusion/water/order/server/ServiceHelp.java
index 286c2cf..94ee0e6 100644
--- a/src/main/java/io/fusion/water/order/server/ServiceHelp.java
+++ b/src/main/java/io/fusion/water/order/server/ServiceHelp.java
@@ -54,7 +54,7 @@ public class ServiceHelp {
 	
 	public static final String DL = "----------------------------------------------------------------------------";
 	
-	public static final String VERSION = "0.9.0";
+	public static final String VERSION = "0.9.1";
 	
 	public static final String LOGO = "" +NL
 	+"============================================================================" + NL
diff --git a/src/main/resources/app.props.build b/src/main/resources/app.props.build
index 7273b9f..115dbff 100644
--- a/src/main/resources/app.props.build
+++ b/src/main/resources/app.props.build
@@ -1,5 +1,5 @@
 # =======================================================================
 # Order Service Properties
 # =======================================================================
-build.number=81
-build.date=Tue Aug 10 23:46:35 IST 2021
+build.number=82
+build.date=Wed Aug 11 02:20:19 IST 2021
diff --git a/src/main/resources/app.props.tmpl b/src/main/resources/app.props.tmpl
index 8d2e247..127d4bb 100644
--- a/src/main/resources/app.props.tmpl
+++ b/src/main/resources/app.props.tmpl
@@ -2,7 +2,7 @@
 # Order Service Properties
 # =======================================================================
 server.port=9080
-server.version=1.0.0
+server.version=0.9.1
 server.restart=true
 #logging.level=INFO
 spring.codec.max-in-memory-size=3MB
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index dd03872..b8f3e1f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,13 +1,13 @@
 # =======================================================================
 # Order Service Properties
 # =======================================================================
-build.number=81
-build.date=Tue Aug 10 23:46:35 IST 2021
+build.number=82
+build.date=Wed Aug 11 02:20:19 IST 2021
 # =======================================================================
 # Order Service Properties
 # =======================================================================
 server.port=9080
-server.version=1.0.0
+server.version=0.9.1
 server.restart=true
 #logging.level=INFO
 spring.codec.max-in-memory-size=3MB
diff --git a/src/main/resources/backup/application.properties.81 b/src/main/resources/backup/application.properties.81
new file mode 100644
index 0000000..226d2bc
--- /dev/null
+++ b/src/main/resources/backup/application.properties.81
@@ -0,0 +1,49 @@
+# =======================================================================
+# Order Service Properties
+# =======================================================================
+build.number=82
+build.date=Wed Aug 11 02:00:13 IST 2021
+# =======================================================================
+# Order Service Properties
+# =======================================================================
+server.port=9080
+server.version=0.9.1
+server.restart=true
+#logging.level=INFO
+spring.codec.max-in-memory-size=3MB
+token.key=sigmaEpsilon6109871597
+app.property.list=element1, element2, element3
+app.property.map={key1:'val1', key2 : 'val2', key3 : 'val3'}
+# =======================================================================
+# Remote Server Properties 
+# =======================================================================
+payment.gateway.host=127.0.0.1
+payment.gateway.port=8080
+remote.host=127.0.0.1
+remote.port=8080
+remote.protocol=http
+# =======================================================================
+# Open API Properties
+# For More Info: https://springdoc.org/#Introduction
+# =======================================================================
+# Disabling the /v3/api-docs enpoint
+springdoc.api-docs.enabled=true
+# Disabling the swagger-ui
+#springdoc.swagger-ui.enabled=true
+# Packages to include
+# springdoc.packagesToScan=io.fusion.water, io.fusion.fire
+# Paths to include
+# springdoc.pathsToMatch=/v1, /api/health/**
+# To expose the swagger-ui, on the management port
+#springdoc.use-management-port=true
+# This property enables the openapi and swaggerui endpoints to be exposed 
+# beneath the actuator base path.
+# management.endpoints.web.exposure.include=openapi, swaggerui
+# =======================================================================
+# Mongo Properties 
+# =======================================================================
+spring.data.mongodb.uri=mongodb://localhost:27017/orderdb
+# =======================================================================
+# Mongock Properties 
+# =======================================================================
+mongock.change-logs-scan-package=io.fusion.water.order.adapters