diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..731ac4f
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/mock-server"
+  schedule:
+    interval: daily
+    time: "23:30"
+  open-pull-requests-limit: 10
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f0c9538
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,94 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+.idea
+
+/target/
+/target/classes/application.properties
+/target/classes/
+
+#########from online
+##############################
+## Java
+##############################
+.mtj.tmp/
+*.class
+*.jar
+*.war
+*.ear
+*.nar
+hs_err_pid*
+
+##############################
+## Maven
+##############################
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+pom.xml.bak
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+##############################
+## Gradle
+##############################
+bin/
+build/
+.gradle
+.gradletasknamecache
+gradle-app.setting
+!gradle-wrapper.jar
+
+##############################
+## IntelliJ
+##############################
+out/
+.idea/
+.idea_modules/
+*.iml
+*.ipr
+*.iws
+
+##############################
+## Eclipse
+##############################
+.settings/
+bin/
+tmp/
+.metadata
+.classpath
+.project
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.loadpath
+.factorypath
+
+##############################
+## NetBeans
+##############################
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+
+##############################
+## Visual Studio Code
+##############################
+.vscode/
+.code-workspace
+
+##############################
+## OS X
+##############################
+.DS_Store
\ No newline at end of file
diff --git a/README.md b/README.md
index dd0ecab..94db086 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,40 @@
 # Mock-server
 Create and use custom responses. No need to wait for the backend!
 
-## What is it?
+**Description** : Create mock response to test your backend or downstream REST calls for any service.
+It can be used to integration with any service without calling actul service.
+
+
 - Spring boot application to mock API requests quickly. 
-- Integrated UI makes designing mock requests easier.
-- All mock requests are persisted in MongoDB. 
-- Can be used to mock both REST and SOAP APIs.
+- All mock response are persisted in MongoDB. 
+- Can be used to mock  REST APIs
+- Can mock request to be sent to any service.
+- Mock response to any request from other service.
+- Test Service as a whole with endpoints by mocking request and response for a service.
+- Uses ReactiveMongo for db connection.
 
-## Installation notes for creating your own server
-1. Install MongoDB
-1. Run the app using spring boot or create an uber jar to deploy
+	- **Technology stack** : Standalone Springboot appliation providing RESTful service written in JAVA 8 with Maven as Build tool and MongoDB as Database. 
 
-## Usage
-1. Design your API response, customize headers and status
-1. Add network delay, if needed
-1. Hit submit, your mock link http://localhost:8080/mock/{mockUUID} is ready
 
 ## Screenshot
 ![Screenshot](https://github.com/kunwardeeps/mock-server/raw/master/mock-server/src/images/screenshot.png)
+
+## Dependencies
+1. Language: Java 8
+2. Database: MongoDb 
+3. Framework: SpringBoot
+4. Build tool: Maven
+
+## Installation Notes:
+1. Install MongoDB or use any cloud service for mongodb.
+2. Run the app using spring boot or create an jar to deploy.
+
+## Configuration:
+1. Configure mongoDb instance/uri in application.yml
+
+## Usage
+1. Design your API response, customize headers and status
+2. Add network delay, if needed
+3. Hit submit, your mock link http://localhost:8080/mock/{mockUUID} is ready
+
+
diff --git a/mock-server/pom.xml b/mock-server/pom.xml
index e63e1e4..79c71f0 100644
--- a/mock-server/pom.xml
+++ b/mock-server/pom.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 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>com.example</groupId>
-	<artifactId>demo</artifactId>
+	<groupId>com.mockapi</groupId>
+	<artifactId>mock-server</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>demo</name>
-	<description>Demo project for Spring Boot</description>
+	<name>mock-server</name>
+	<description>Mocking server developed with Spring Boot</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.6.RELEASE</version>
+		<version>2.5.4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -35,30 +35,31 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 		
 		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
 		<dependency>
 		    <groupId>org.springframework.boot</groupId>
 		    <artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web-services</artifactId>
+		</dependency>
 		
 		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
 		<dependency>
 		    <groupId>org.apache.commons</groupId>
 		    <artifactId>commons-lang3</artifactId>
-		    <version>3.6</version>
+		    <version>3.12.0</version>
 		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-jasper</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		
+
 		<dependency>
-		    <groupId>javax.servlet</groupId>
-		    <artifactId>jstl</artifactId>
-		    <scope>provided</scope>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
 		
 		<dependency>
@@ -67,12 +68,38 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-mongodb</artifactId>
+			<artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
 		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.springframework.boot</groupId>-->
+<!--			<artifactId>spring-boot-starter-data-mongodb</artifactId>-->
+<!--		</dependency>-->
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-social-facebook</artifactId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.32</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-hateoas</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-rest-hal-browser</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore</artifactId>
@@ -84,6 +111,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<addResources>true</addResources>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/mock-server/src/main/java/com/mockapi/MockController.java b/mock-server/src/main/java/com/mockapi/MockController.java
deleted file mode 100644
index 4eec9d6..0000000
--- a/mock-server/src/main/java/com/mockapi/MockController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mockapi;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.mockapi.dto.MockRequestDTO;
-
-@Controller
-public class MockController {
-	
-	@RequestMapping(value = "/welcome")
-    public String home(Model model) {
-        model.addAttribute("mockReq", new MockRequestDTO());
-        return "welcome";
-    }
-	
-
-}
\ No newline at end of file
diff --git a/mock-server/src/main/java/com/mockapi/MockRestController.java b/mock-server/src/main/java/com/mockapi/MockRestController.java
deleted file mode 100644
index ac5cad5..0000000
--- a/mock-server/src/main/java/com/mockapi/MockRestController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.mockapi;
-
-import org.apache.commons.lang3.StringUtils;
-import org.bson.types.ObjectId;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.mockapi.dto.HeaderDTO;
-import com.mockapi.dto.MockRequestDTO;
-import com.mockapi.entity.MockRequest;
-import com.mockapi.repository.NoSQLRepository;
-
-@RestController
-public class MockRestController {
-	
-	@Autowired
-	private NoSQLRepository repository;
-	
-    @RequestMapping(value = "/mock/{mockId}")
-    public ResponseEntity<String> mockRequest(@PathVariable String mockId) {
-    	
-    	MockRequest entity = repository.getByMockId(mockId);
-    	MultiValueMap<String, String> headers = getHeadersFromEntity(entity);
-    	HttpStatus httpStatus = HttpStatus.valueOf(entity.getStatusCode());
-    	
-    	if (entity.getDelay() > 0){
-    		try {
-				Thread.sleep(entity.getDelay());
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-    	}
-    	
-    	return new ResponseEntity<String>(entity.getBody(), headers, httpStatus);
-    }
-
-	@RequestMapping(value = "/save", method = RequestMethod.POST)
-    //@CrossOrigin(origins = "http://localhost:4200")
-    public ResponseEntity<String> save(@RequestBody MockRequestDTO request) {
-    	
-    	MockRequest entity = getEntityFromDTO(request);
-    	
-    	repository.save(entity);
-    	
-    	String url = new StringBuilder("http://localhost:8080/")
-    			.append("mock/")
-    			.append(entity.getMockId())
-    			.toString();
-    	
-    	return new ResponseEntity<String>(url, HttpStatus.OK);
-    }
-    
-    private MultiValueMap<String, String> getHeadersFromEntity(MockRequest entity) {
-    	MultiValueMap<String, String> headers = new HttpHeaders();
-    	
-    	for (HeaderDTO header: entity.getHeaders()){
-    		headers.add(header.getName(), header.getValue());
-    	}
-    	
-    	if (StringUtils.isNotEmpty(entity.getContentType())){
-    		headers.add("Content-Type", entity.getContentType());
-    		headers.add("Accept-Encoding", entity.getEncoding());
-    	}
-		return headers;
-	}
-
-	private MockRequest getEntityFromDTO(MockRequestDTO request) {
-		
-		MockRequest entity = new MockRequest();
-		ObjectId id = new ObjectId();
-
-    	entity.setMockId(id.toString());
-    	entity.setBody(request.getBody());
-    	entity.setContentType(request.getContentType());
-    	entity.setEncoding(request.getEncoding());
-    	entity.setStatusCode(request.getStatusCode());
-    	entity.setHeaders(request.getHeaders());
-    	entity.setDelay(request.getDelay());
-    	
-    	return entity;
-	}
-
-}
\ No newline at end of file
diff --git a/mock-server/src/main/java/com/mockapi/controller/MockController.java b/mock-server/src/main/java/com/mockapi/controller/MockController.java
new file mode 100644
index 0000000..b71f655
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/controller/MockController.java
@@ -0,0 +1,24 @@
+package com.mockapi.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class MockController {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(MockController.class);
+
+    @Value("${spring.application.name}")
+    String appName;
+
+    @GetMapping("/")
+    public String homePage(Model model) {
+        model.addAttribute("appName", appName);
+        return "index";
+    }
+
+}
\ No newline at end of file
diff --git a/mock-server/src/main/java/com/mockapi/controller/MockRestController.java b/mock-server/src/main/java/com/mockapi/controller/MockRestController.java
new file mode 100644
index 0000000..77356e3
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/controller/MockRestController.java
@@ -0,0 +1,69 @@
+package com.mockapi.controller;
+
+import com.mockapi.dto.MockResponseDTO;
+import com.mockapi.dto.RequestDTO;
+import com.mockapi.service.MockService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api")
+public class MockRestController {
+
+	@Autowired
+	private MockService mockService;
+
+	public static final Logger LOGGER = LoggerFactory.getLogger(MockRestController.class);
+
+    @RequestMapping(value = "/mock/{mockId}", method = {RequestMethod.GET, RequestMethod.POST})
+    public ResponseEntity<Object> mockRequestGet(@PathVariable String mockId) {
+        LOGGER.info("Received Request at mock endpoint /mock/{}", mockId);
+		return mockService.testMockResponse(mockId);
+    }
+
+	@PostMapping(value = "/save/response")
+    //@CrossOrigin(origins = "http://localhost:4200")
+    public ResponseEntity<Object> saveMock(@RequestBody MockResponseDTO request) {
+        LOGGER.info("Got mock {} to be saved to DB", request);
+    	return mockService.saveMockResponse(request);
+    }
+
+    @PostMapping(value = "/delete/response")
+    //@CrossOrigin(origins = "http://localhost:4200")
+    public ResponseEntity<Object> deleteMock(@RequestBody MockResponseDTO request) {
+        LOGGER.info("Got mock {} to be deleted from DB", request);
+        return mockService.deleteMockResponse(request);
+    }
+
+    @PostMapping(value = "/test")
+    public ResponseEntity<Object> test(@RequestBody RequestDTO requestDTO){
+        LOGGER.info("testing endpoint: {}/{}", requestDTO.getHostName(), requestDTO.getEndpoint());
+        return mockService.testDTOEndpoint(requestDTO);
+    }
+
+    @PostMapping(value = "/save/request")
+    //@CrossOrigin(origins = "http://localhost:4200")
+    public ResponseEntity<Object> saveMockRequest(@RequestBody RequestDTO request) {
+        LOGGER.info("Got mock {} to be saved to DB", request);
+        return mockService.saveMockRequest(request);
+    }
+
+    @PostMapping(value = "/delete/request")
+    //@CrossOrigin(origins = "http://localhost:4200")
+    public ResponseEntity<Object> deleteMock(@RequestBody RequestDTO request) {
+        LOGGER.info("Got mock {} to be deleted from DB", request);
+        return mockService.deleteMockRequest(request);
+    }
+
+    @GetMapping(value = "/test/{mockId}")
+    public ResponseEntity<Object> testMockId(@PathVariable String mockId){
+        LOGGER.info("testing mockID {} ", mockId);
+        return mockService.testRequestMockId(mockId);
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/mock-server/src/main/java/com/mockapi/controller/MockRestControllerV2.java b/mock-server/src/main/java/com/mockapi/controller/MockRestControllerV2.java
new file mode 100644
index 0000000..87fa219
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/controller/MockRestControllerV2.java
@@ -0,0 +1,89 @@
+package com.mockapi.controller;
+
+import com.mockapi.dto.MockResponseDTO;
+import com.mockapi.entity.MockResponse;
+import com.mockapi.repository.NoSQLResponseRepository;
+import com.mockapi.service.MockResponseService;
+import com.mockapi.utils.ServiceUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/api/v2/response")
+public class MockRestControllerV2 {
+
+    @Autowired
+    private MockResponseService mockResponseService;
+
+    @Autowired
+    private NoSQLResponseRepository responseRepository;
+
+    @Autowired
+    private ServiceUtils serviceUtils;
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(MockRestControllerV2.class);
+
+    @GetMapping
+    public Flux<MockResponse> getResponses(){
+        LOGGER.info("Getting all responses from DB");
+        return responseRepository.findAll();
+    }
+
+    @GetMapping(value = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public Flux<MockResponse> getResponsesStream(){
+        LOGGER.info("Getting all responses from DB");
+        return responseRepository.findAll();
+    }
+
+    @GetMapping("/{mockId}")
+    public Mono<ResponseEntity<MockResponse>> getResponseById(@PathVariable String mockId){
+        LOGGER.info("Fetching {} from DB",mockId);
+        return responseRepository.findById(mockId)
+                .map(ResponseEntity::ok)
+                .defaultIfEmpty(ResponseEntity.notFound().build());
+    }
+
+    @DeleteMapping("/{mockId}")
+    public Mono<ResponseEntity<Object>> deleteResponseById(@PathVariable String mockId){
+        LOGGER.info("Deleting {} from DB",mockId);
+        return responseRepository.findById(mockId)
+                .flatMap(mockResponseFromDb -> responseRepository.delete(mockResponseFromDb)
+                        .then(Mono.just(new ResponseEntity<Object>("{\"message\":\"Deleted\"}",HttpStatus.OK))))
+                .defaultIfEmpty(ResponseEntity.notFound().build());
+    }
+
+    @PostMapping
+    public Mono<ResponseEntity<MockResponse>> create(@RequestBody MockResponseDTO responseDTO){
+        MockResponse mockResponse = serviceUtils.getResponseEntityFromDTO(responseDTO);
+        LOGGER.info("saving {} to DB", mockResponse);
+        return responseRepository.save(mockResponse)
+                .map(ResponseEntity::ok)
+                .defaultIfEmpty(ResponseEntity.unprocessableEntity().build());
+    }
+
+    @PutMapping("/{mockId}")
+    public Mono updateStudent(@PathVariable String mockId, @RequestBody MockResponseDTO responseDTO){
+        MockResponse mockResponse = serviceUtils.getResponseEntityFromDTO(responseDTO);
+        return responseRepository.findById(mockId)
+                .flatMap(selectedResponseFromDB ->{
+                    selectedResponseFromDB=mockResponse;
+                    return responseRepository.save(selectedResponseFromDB);
+                })
+                .map(ResponseEntity::ok)
+                .defaultIfEmpty(new ResponseEntity<>(HttpStatus.NOT_FOUND));
+    }
+
+    @RequestMapping(value = "/test/{mockId}", method = {RequestMethod.GET, RequestMethod.POST})
+    public Mono<ResponseEntity<Object>> mockRequestTest(@PathVariable String mockId) {
+        LOGGER.info("Received Request at mock endpoint /mock/{}", mockId);
+        return mockResponseService.testMockResponse(mockId);
+    }
+}
diff --git a/mock-server/src/main/java/com/mockapi/dto/HeaderDTO.java b/mock-server/src/main/java/com/mockapi/dto/HeaderDTO.java
index acebf88..c6e3e66 100644
--- a/mock-server/src/main/java/com/mockapi/dto/HeaderDTO.java
+++ b/mock-server/src/main/java/com/mockapi/dto/HeaderDTO.java
@@ -21,4 +21,12 @@ public void setValue(String value) {
 	public String toString() {
 		return "HeaderDTO [name=" + name + ", value=" + value + "]";
 	}
+
+	public HeaderDTO(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public HeaderDTO() {
+	}
 }
diff --git a/mock-server/src/main/java/com/mockapi/dto/MockRequestDTO.java b/mock-server/src/main/java/com/mockapi/dto/MockResponseDTO.java
similarity index 83%
rename from mock-server/src/main/java/com/mockapi/dto/MockRequestDTO.java
rename to mock-server/src/main/java/com/mockapi/dto/MockResponseDTO.java
index 4b33af6..0077167 100644
--- a/mock-server/src/main/java/com/mockapi/dto/MockRequestDTO.java
+++ b/mock-server/src/main/java/com/mockapi/dto/MockResponseDTO.java
@@ -2,14 +2,14 @@
 
 import java.util.List;
 
-public class MockRequestDTO {
+public class MockResponseDTO {
 	
 	private String mockId;
 	
 	private int statusCode;
 	private String contentType;
 	private String encoding;
-	private String body;
+	private Object body;
 	private List<HeaderDTO> headers;
 	private int delay;
 
@@ -45,11 +45,11 @@ public void setEncoding(String encoding) {
 		this.encoding = encoding;
 	}
 
-	public String getBody() {
+	public Object getBody() {
 		return body;
 	}
 
-	public void setBody(String body) {
+	public void setBody(Object body) {
 		this.body = body;
 	}
 
@@ -71,7 +71,7 @@ public void setDelay(int delay) {
 
 	@Override
 	public String toString() {
-		return "MockRequestDTO [mockId=" + mockId + ", statusCode=" + statusCode + ", contentType=" + contentType
+		return "MockResponseDTO [mockId=" + mockId + ", statusCode=" + statusCode + ", contentType=" + contentType
 				+ ", encoding=" + encoding + ", body=" + body + ", headers=" + headers + "]";
 	}
 
diff --git a/mock-server/src/main/java/com/mockapi/dto/RequestDTO.java b/mock-server/src/main/java/com/mockapi/dto/RequestDTO.java
new file mode 100644
index 0000000..c6a5eee
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/dto/RequestDTO.java
@@ -0,0 +1,113 @@
+package com.mockapi.dto;
+
+import java.util.List;
+
+public class RequestDTO {
+
+    private String mockID;
+    private String hostName;
+    private String endpoint;
+    private String schema;
+    private String httpMethod;
+    private String contentType;
+    private String encoding;
+    private Object body;
+    private List<HeaderDTO> headers;
+    private String  accept;
+
+    public String getMockID() {
+        return mockID;
+    }
+
+    public void setMockID(String mockID) {
+        this.mockID = mockID;
+    }
+
+    public String getAccept() {
+        return accept;
+    }
+
+    public void setAccept(String accept) {
+        this.accept = accept;
+    }
+
+    public String getHostName() {
+        return hostName;
+    }
+
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
+
+    public String getEndpoint() {
+        return endpoint;
+    }
+
+    public void setEndpoint(String endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    public String getSchema() {
+        return schema;
+    }
+
+    public void setSchema(String schema) {
+        this.schema = schema;
+    }
+
+    public String getHttpMethod() {
+        return httpMethod;
+    }
+
+    public void setHttpMethod(String httpMethod) {
+        this.httpMethod = httpMethod;
+    }
+
+    public String getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+
+    public String getEncoding() {
+        return encoding;
+    }
+
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
+    public Object getBody() {
+        return body;
+    }
+
+    public void setBody(Object body) {
+        this.body = body;
+    }
+
+    public List<HeaderDTO> getHeaders() {
+        return headers;
+    }
+
+    public void setHeaders(List<HeaderDTO> headers) {
+        this.headers = headers;
+    }
+
+    @Override
+    public String toString() {
+        return "RequestDTO{" +
+                "mockID='" + mockID + '\'' +
+                ", hostName='" + hostName + '\'' +
+                ", endpoint='" + endpoint + '\'' +
+                ", schema='" + schema + '\'' +
+                ", httpMethod='" + httpMethod + '\'' +
+                ", contentType='" + contentType + '\'' +
+                ", encoding='" + encoding + '\'' +
+                ", body=" + body +
+                ", headers=" + headers +
+                ", accept='" + accept + '\'' +
+                '}';
+    }
+}
diff --git a/mock-server/src/main/java/com/mockapi/entity/MockRequest.java b/mock-server/src/main/java/com/mockapi/entity/MockRequest.java
index 3a8f2be..34f597b 100644
--- a/mock-server/src/main/java/com/mockapi/entity/MockRequest.java
+++ b/mock-server/src/main/java/com/mockapi/entity/MockRequest.java
@@ -1,64 +1,87 @@
 package com.mockapi.entity;
 
-import java.util.List;
-import java.util.Map;
-
+import com.mockapi.dto.HeaderDTO;
 import org.springframework.data.annotation.Id;
 
-import com.mockapi.dto.HeaderDTO;
+import java.util.List;
 
 public class MockRequest {
-	
-	@Id
-    private String mockId;
-	
-	private int statusCode;
-	private String contentType;
-	private String encoding;
-	private String body;
-	private List<HeaderDTO> headers;
-	private int delay;
-	
-	public String getMockId() {
-		return mockId;
-	}
-	public void setMockId(String mockId) {
-		this.mockId = mockId;
-	}
-	public int getStatusCode() {
-		return statusCode;
-	}
-	public void setStatusCode(int statusCode) {
-		this.statusCode = statusCode;
-	}
-	public String getContentType() {
-		return contentType;
-	}
-	public void setContentType(String contentType) {
-		this.contentType = contentType;
-	}
-	public String getEncoding() {
-		return encoding;
-	}
-	public void setEncoding(String encoding) {
-		this.encoding = encoding;
-	}
-	public String getBody() {
-		return body;
-	}
-	public void setBody(String body) {
-		this.body = body;
-	}
-	public List<HeaderDTO> getHeaders() {
-		return headers;
-	}
-	public void setHeaders(List<HeaderDTO> headers) {
-		this.headers = headers;
-	}
-	public int getDelay() {
-		return delay;
-	}
-	public void setDelay(int delay) {
-		this.delay = delay;
-	}
-}
\ No newline at end of file
+    @Id
+    private String mockID;
+    private String hostName;
+    private String endpoint;
+    private String schema;
+    private String httpMethod;
+    private Object body;
+    private List<HeaderDTO> headers;
+
+    public String getMockID() {
+        return mockID;
+    }
+
+    public void setMockID(String mockID) {
+        this.mockID = mockID;
+    }
+
+    public String getHostName() {
+        return hostName;
+    }
+
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
+
+    public String getEndpoint() {
+        return endpoint;
+    }
+
+    public void setEndpoint(String endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    public String getSchema() {
+        return schema;
+    }
+
+    public void setSchema(String schema) {
+        this.schema = schema;
+    }
+
+    public String getHttpMethod() {
+        return httpMethod;
+    }
+
+    public void setHttpMethod(String httpMethod) {
+        this.httpMethod = httpMethod;
+    }
+
+    public Object getBody() {
+        return body;
+    }
+
+    public void setBody(Object body) {
+        this.body = body;
+    }
+
+    public List<HeaderDTO> getHeaders() {
+        return headers;
+    }
+
+    public void setHeaders(List<HeaderDTO> headers) {
+        this.headers = headers;
+    }
+
+    @Override
+    public String toString() {
+        return "MockRequest{" +
+                "mockID='" + mockID + '\'' +
+                ", hostName='" + hostName + '\'' +
+                ", endpoint='" + endpoint + '\'' +
+                ", schema='" + schema + '\'' +
+                ", httpMethod=" + httpMethod +
+                ", body=" + body +
+                ", headers=" + headers +
+                '}';
+    }
+
+}
diff --git a/mock-server/src/main/java/com/mockapi/entity/MockResponse.java b/mock-server/src/main/java/com/mockapi/entity/MockResponse.java
new file mode 100644
index 0000000..6f50992
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/entity/MockResponse.java
@@ -0,0 +1,76 @@
+package com.mockapi.entity;
+
+import java.util.List;
+
+import org.springframework.data.annotation.Id;
+
+import com.mockapi.dto.HeaderDTO;
+
+public class MockResponse {
+	
+	@Id
+    private String mockId;
+	
+	private int statusCode;
+	private String contentType;
+	private String encoding;
+	private Object body;
+	private List<HeaderDTO> headers;
+	private int delay;
+	
+	public String getMockId() {
+		return mockId;
+	}
+	public void setMockId(String mockId) {
+		this.mockId = mockId;
+	}
+	public int getStatusCode() {
+		return statusCode;
+	}
+	public void setStatusCode(int statusCode) {
+		this.statusCode = statusCode;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public String getEncoding() {
+		return encoding;
+	}
+	public void setEncoding(String encoding) {
+		this.encoding = encoding;
+	}
+	public Object getBody() {
+		return body;
+	}
+	public void setBody(Object body) {
+		this.body = body;
+	}
+	public List<HeaderDTO> getHeaders() {
+		return headers;
+	}
+	public void setHeaders(List<HeaderDTO> headers) {
+		this.headers = headers;
+	}
+	public int getDelay() {
+		return delay;
+	}
+	public void setDelay(int delay) {
+		this.delay = delay;
+	}
+
+	@Override
+	public String toString() {
+		return "MockResponseService{" +
+				"mockId='" + mockId + '\'' +
+				", statusCode=" + statusCode +
+				", contentType='" + contentType + '\'' +
+				", encoding='" + encoding + '\'' +
+				", body=" + body +
+				", headers=" + headers +
+				", delay=" + delay +
+				'}';
+	}
+}
\ No newline at end of file
diff --git a/mock-server/src/main/java/com/mockapi/repository/NoSQLRepository.java b/mock-server/src/main/java/com/mockapi/repository/NoSQLRepository.java
deleted file mode 100644
index c583d91..0000000
--- a/mock-server/src/main/java/com/mockapi/repository/NoSQLRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.mockapi.repository;
-
-import org.springframework.data.mongodb.repository.MongoRepository;
-
-import com.mockapi.entity.MockRequest;
-
-public interface NoSQLRepository extends MongoRepository<MockRequest, String> {
-	
-	public MockRequest getByMockId(String mockId);
-
-}
diff --git a/mock-server/src/main/java/com/mockapi/repository/NoSQLRequestRepository.java b/mock-server/src/main/java/com/mockapi/repository/NoSQLRequestRepository.java
new file mode 100644
index 0000000..95265b6
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/repository/NoSQLRequestRepository.java
@@ -0,0 +1,10 @@
+package com.mockapi.repository;
+
+import com.mockapi.entity.MockRequest;
+import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
+import reactor.core.publisher.Mono;
+
+public interface NoSQLRequestRepository extends ReactiveMongoRepository<MockRequest, String> {
+
+    Mono<MockRequest> getByMockID(String mockId);
+}
diff --git a/mock-server/src/main/java/com/mockapi/repository/NoSQLResponseRepository.java b/mock-server/src/main/java/com/mockapi/repository/NoSQLResponseRepository.java
new file mode 100644
index 0000000..78f979a
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/repository/NoSQLResponseRepository.java
@@ -0,0 +1,11 @@
+package com.mockapi.repository;
+
+import com.mockapi.entity.MockResponse;
+import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
+import reactor.core.publisher.Mono;
+
+public interface NoSQLResponseRepository extends ReactiveMongoRepository<MockResponse, String> {
+
+	Mono<MockResponse> getByMockId(String mockId);
+
+}
diff --git a/mock-server/src/main/java/com/mockapi/service/MockResponseService.java b/mock-server/src/main/java/com/mockapi/service/MockResponseService.java
new file mode 100644
index 0000000..7ea346c
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/service/MockResponseService.java
@@ -0,0 +1,10 @@
+package com.mockapi.service;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+@Service
+public interface MockResponseService {
+    Mono<ResponseEntity<Object>> testMockResponse(String mockId);
+}
diff --git a/mock-server/src/main/java/com/mockapi/service/MockService.java b/mock-server/src/main/java/com/mockapi/service/MockService.java
new file mode 100644
index 0000000..791e734
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/service/MockService.java
@@ -0,0 +1,17 @@
+package com.mockapi.service;
+
+import com.mockapi.dto.MockResponseDTO;
+import com.mockapi.dto.RequestDTO;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface MockService {
+    ResponseEntity<Object> testMockResponse(String mockId);
+    ResponseEntity<Object> saveMockResponse(MockResponseDTO request);
+    ResponseEntity<Object> deleteMockResponse(MockResponseDTO request);
+    ResponseEntity<Object> testDTOEndpoint(RequestDTO request);
+    ResponseEntity<Object> testRequestMockId(String mockId);
+    ResponseEntity<Object> deleteMockRequest(RequestDTO request);
+    ResponseEntity<Object> saveMockRequest(RequestDTO requestDTO);
+}
diff --git a/mock-server/src/main/java/com/mockapi/service/impl/MockResponseServiceImpl.java b/mock-server/src/main/java/com/mockapi/service/impl/MockResponseServiceImpl.java
new file mode 100644
index 0000000..77c73d9
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/service/impl/MockResponseServiceImpl.java
@@ -0,0 +1,50 @@
+package com.mockapi.service.impl;
+
+import com.mockapi.repository.NoSQLResponseRepository;
+import com.mockapi.service.MockResponseService;
+import com.mockapi.utils.ServiceUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+import reactor.core.publisher.Mono;
+
+@Service
+public class MockResponseServiceImpl implements MockResponseService {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(MockResponseServiceImpl.class);
+
+    @Autowired
+    private NoSQLResponseRepository responseRepository;
+
+    @Autowired
+    private ServiceUtils serviceUtils;
+
+    public MockResponseServiceImpl(ServiceUtils serviceUtils) {
+        this.serviceUtils = serviceUtils;
+    }
+
+    @Override
+    public Mono<ResponseEntity<Object>> testMockResponse(String mockId) {
+        return responseRepository.getByMockId(mockId)
+                .flatMap(mockResponse -> {
+                    LOGGER.debug("Got entity {} for mockID {} ", mockResponse, mockId);
+                    MultiValueMap<String, String> headers = serviceUtils.getHeadersFromEntity(mockResponse);
+                    HttpStatus httpStatus = HttpStatus.valueOf(mockResponse.getStatusCode());
+                    LOGGER.debug("Entering Delay period of {}", mockResponse.getDelay());
+                    if (mockResponse.getDelay() > 0){
+                        try {
+                            Thread.sleep(mockResponse.getDelay());
+                        } catch (InterruptedException e) {
+                            LOGGER.error("Thread Interrupted {}", Thread.currentThread());
+                            Thread.currentThread().interrupt();
+                        }
+                    }
+                    return Mono.justOrEmpty(new ResponseEntity<>(mockResponse.getBody(), headers, httpStatus));
+                })
+                .defaultIfEmpty(new ResponseEntity<>(HttpStatus.NOT_FOUND));
+    }
+}
diff --git a/mock-server/src/main/java/com/mockapi/service/impl/MockServiceImpl.java b/mock-server/src/main/java/com/mockapi/service/impl/MockServiceImpl.java
new file mode 100644
index 0000000..2b509a0
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/service/impl/MockServiceImpl.java
@@ -0,0 +1,162 @@
+package com.mockapi.service.impl;
+
+import com.mockapi.dto.MockResponseDTO;
+import com.mockapi.dto.RequestDTO;
+import com.mockapi.entity.MockRequest;
+import com.mockapi.entity.MockResponse;
+import com.mockapi.repository.NoSQLRequestRepository;
+import com.mockapi.repository.NoSQLResponseRepository;
+import com.mockapi.service.MockService;
+import com.mockapi.utils.ServiceUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.UnknownHostException;
+
+@Service
+public class MockServiceImpl implements MockService {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(MockServiceImpl.class);
+
+    @Autowired
+    private NoSQLResponseRepository responseRepository;
+
+    @Autowired
+    private NoSQLRequestRepository requestRepository;
+
+    @Autowired
+    private Environment environment;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private ServiceUtils serviceUtils;
+
+    public MockServiceImpl(ServiceUtils serviceUtils) {
+        this.serviceUtils = serviceUtils;
+    }
+
+    public ResponseEntity<Object> testMockResponse(String mockId) {
+        MockResponse entity = responseRepository.getByMockId(mockId).block();
+        if (entity != null) {
+            LOGGER.debug("Test Entity from DB : {}",entity);
+            LOGGER.debug("Got entity {} for mockID {} ", entity, mockId);
+            MultiValueMap<String, String> headers = serviceUtils.getHeadersFromEntity(entity);
+            HttpStatus httpStatus = HttpStatus.valueOf(entity.getStatusCode());
+            LOGGER.debug("Entering Delay period of {}", entity.getDelay());
+            if (entity.getDelay() > 0){
+                try {
+                    Thread.sleep(entity.getDelay());
+                } catch (InterruptedException e) {
+                    LOGGER.error("Thread Interrupted {}", Thread.currentThread());
+                    Thread.currentThread().interrupt();
+                }
+            }
+            return new ResponseEntity<>(entity.getBody(), headers, httpStatus);
+        } else {
+            LOGGER.error("No mock Response found for {}", mockId);
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+
+    public ResponseEntity<Object> saveMockResponse(MockResponseDTO request) {
+        MockResponse entity = serviceUtils.getResponseEntityFromDTO(request);
+
+        LOGGER.debug("Saving entity {}", entity);
+        responseRepository.save(entity).block();
+
+        String url = null;
+        try {
+            url = "http://" + InetAddress.getLocalHost().getHostName() + ":" + environment.getProperty("server.port") +
+                    "/api/mock/" +
+                    entity.getMockId();
+        } catch (UnknownHostException e) {
+            LOGGER.error("Unable to resolve current hostname ");
+            e.printStackTrace();
+        }
+
+        return new ResponseEntity<>(url, HttpStatus.OK);
+    }
+
+    public ResponseEntity<Object> deleteMockResponse(MockResponseDTO request) {
+        try {
+            MockResponse entity = responseRepository.getByMockId(request.getMockId()).block();
+            assert entity != null;
+            LOGGER.debug("Got entity to be deleted: {}", entity);
+            LOGGER.info("Deleting {}",entity.getMockId());
+            responseRepository.delete(entity).block();
+            return new ResponseEntity<>(
+                    "{\"message\":\"Deletion Successful \" }", HttpStatus.OK);
+        } catch (Exception e){
+            LOGGER.error("Error occured while deleting: {}", request.getMockId());
+            return new ResponseEntity<>(
+                    "{\"message\":\"Failed to delete" +request.getMockId()+" \" }", HttpStatus.NO_CONTENT);
+        }
+    }
+
+    public ResponseEntity<Object> testEndpoint(MockRequest request) {
+        URI uri = serviceUtils.generateUri(request.getHostName(), request.getEndpoint(), request.getSchema());
+        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+        request.getHeaders().forEach(headerDTO -> headers.add(headerDTO.getName(),headerDTO.getValue()));
+        RequestEntity<Object> requestEntity;
+        requestEntity = new RequestEntity<>(request.getBody(),headers, HttpMethod.resolve(request.getHttpMethod()),uri);
+        return restTemplate.exchange(requestEntity, Object.class);
+    }
+
+    public ResponseEntity<Object> testDTOEndpoint(RequestDTO requestDTO){
+        MockRequest mockRequestFromDTO = serviceUtils.getMockRequestFromDTO(requestDTO);
+        return testEndpoint(mockRequestFromDTO);
+    }
+
+    public ResponseEntity<Object> saveMockRequest(RequestDTO requestDTO){
+        MockRequest entity = serviceUtils.getMockRequestFromDTO(requestDTO);
+        LOGGER.debug("Saving entity {}", entity);
+        requestRepository.save(entity).block();
+
+        String url = null;
+        try {
+            url = "http://" + InetAddress.getLocalHost().getHostName() + ":" + environment.getProperty("server.port") +
+                    "/api/mock/" +
+                    entity.getMockID();
+        } catch (UnknownHostException e) {
+            LOGGER.error("Unable to resolve current hostname ");
+            e.printStackTrace();
+        }
+        return new ResponseEntity<>(url, HttpStatus.OK);
+    }
+
+    public ResponseEntity<Object> deleteMockRequest(RequestDTO request) {
+        try {
+            MockRequest entity = requestRepository.getByMockID(request.getMockID()).block();
+            assert entity != null;
+            LOGGER.debug("Got entity to be deleted: {}", entity);
+            LOGGER.info("Deleting {}",entity.getMockID());
+            requestRepository.delete(entity).block();
+            return new ResponseEntity<>(
+                    "{\"message\":\"Deletion Successful \" }", HttpStatus.OK);
+        } catch (Exception e){
+            LOGGER.error("Error occured while deleting: {}", request.getMockID());
+            return new ResponseEntity<>(
+                    "{\"message\":\"Failed to delete" +request.getMockID()+" \" }", HttpStatus.NO_CONTENT);
+        }
+    }
+
+    public ResponseEntity<Object> testRequestMockId(String mockId){
+        MockRequest entity = requestRepository.getByMockID(mockId).block();
+        assert entity != null;
+        return testEndpoint(entity);
+    }
+}
diff --git a/mock-server/src/main/java/com/mockapi/utils/ServiceUtils.java b/mock-server/src/main/java/com/mockapi/utils/ServiceUtils.java
new file mode 100644
index 0000000..8a05374
--- /dev/null
+++ b/mock-server/src/main/java/com/mockapi/utils/ServiceUtils.java
@@ -0,0 +1,106 @@
+package com.mockapi.utils;
+
+import com.mockapi.dto.HeaderDTO;
+import com.mockapi.dto.MockResponseDTO;
+import com.mockapi.dto.RequestDTO;
+import com.mockapi.entity.MockRequest;
+import com.mockapi.entity.MockResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.bson.types.ObjectId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponents;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.net.URI;
+import java.util.List;
+
+@Component
+public class ServiceUtils {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(ServiceUtils.class);
+
+    public MockResponse getResponseEntityFromDTO(MockResponseDTO request) {
+
+        MockResponse entity = new MockResponse();
+
+        if (request.getMockId() == null) {
+            LOGGER.debug("No mockID passed in request body, generating mockID");
+            ObjectId id = new ObjectId();
+            LOGGER.info("Generated MockId: {}", id);
+            entity.setMockId(id.toString());
+        } else entity.setMockId(request.getMockId());
+
+        entity.setBody(request.getBody());
+        entity.setContentType(request.getContentType());
+        entity.setEncoding(request.getEncoding());
+        entity.setStatusCode(request.getStatusCode());
+        entity.setHeaders(request.getHeaders());
+        entity.setDelay(request.getDelay());
+
+        return entity;
+    }
+
+    public MultiValueMap<String, String> getHeadersFromEntity(MockResponse entity) {
+        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+
+        for (HeaderDTO header: entity.getHeaders()){
+            headers.add(header.getName(), header.getValue());
+        }
+
+        if (StringUtils.isNotEmpty(entity.getContentType())){
+            headers.add("Content-Type", entity.getContentType());
+        }
+        if (StringUtils.isNotEmpty(entity.getEncoding())){
+            headers.add("Accept-Encoding", entity.getEncoding());
+        }
+        LOGGER.debug("Headers length {} for entity {}",headers.size(),entity.getMockId());
+        return headers;
+    }
+
+    public URI generateUri(String hostname, String endPoint, String schema){
+        UriComponents uriComponents;
+        if(StringUtils.contains(hostname,":")){
+            String[] hostnamePort = hostname.split(":");
+            uriComponents = UriComponentsBuilder.newInstance()
+                    .scheme(schema).host(hostnamePort[0]).port(hostnamePort[1]).path(endPoint).build();
+        } else {
+            uriComponents = UriComponentsBuilder.newInstance()
+                    .scheme(schema).host(hostname).path(endPoint).build();
+        }
+        return uriComponents.toUri();
+    }
+
+    public MockRequest getMockRequestFromDTO(RequestDTO requestDTO){
+        MockRequest mockRequest = new MockRequest();
+        mockRequest.setBody(requestDTO.getBody());
+        List<HeaderDTO> headerDTOList = requestDTO.getHeaders();
+        if (StringUtils.isNotEmpty(requestDTO.getEncoding())){
+            headerDTOList.add(new HeaderDTO("Accept-Encoding", requestDTO.getEncoding()));
+        }
+        if (StringUtils.isNotEmpty(requestDTO.getContentType())){
+            headerDTOList.add(new HeaderDTO("Content-Type", requestDTO.getContentType()));
+        }
+        if (StringUtils.isNotEmpty(requestDTO.getAccept())){
+            headerDTOList.add(new HeaderDTO("Accept", requestDTO.getAccept()));
+        }
+        mockRequest.setEndpoint(requestDTO.getEndpoint());
+        mockRequest.setHostName(requestDTO.getHostName());
+        mockRequest.setHeaders(headerDTOList);
+        mockRequest.setSchema(requestDTO.getSchema());
+        mockRequest.setMockID(requestDTO.getMockID());
+        mockRequest.setHttpMethod(requestDTO.getHttpMethod());
+        return mockRequest;
+    }
+
+    @Bean
+    public RestTemplate getRestTemplate() {
+        return new RestTemplate();
+    }
+
+}
diff --git a/mock-server/src/main/resources/application.properties b/mock-server/src/main/resources/application.properties
deleted file mode 100644
index a775892..0000000
--- a/mock-server/src/main/resources/application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-spring.mvc.view.prefix=/WEB-INF/view/
-spring.mvc.view.suffix=.jsp
-spring.data.mongodb.uri=mongodb://mongodbuser:mongodb@my-cluster-shard-00-00-wcfui.mongodb.net:27017,my-cluster-shard-00-01-wcfui.mongodb.net:27017,my-cluster-shard-00-02-wcfui.mongodb.net:27017/test?ssl=true&replicaSet=my-cluster-shard-0&authSource=admin&retryWrites=true&w=majority
\ No newline at end of file
diff --git a/mock-server/src/main/resources/application.yml b/mock-server/src/main/resources/application.yml
new file mode 100644
index 0000000..4c7ec8b
--- /dev/null
+++ b/mock-server/src/main/resources/application.yml
@@ -0,0 +1,11 @@
+logging:
+    level:
+        com:
+            mockapi: INFO
+        web: INFO
+spring:
+    application:
+        name: MockServer
+    data:
+        mongodb:
+            uri: ${MONGO_DB_CONNECTION}
diff --git a/mock-server/src/main/resources/static/css/mock.css b/mock-server/src/main/resources/static/css/mock.css
new file mode 100644
index 0000000..b5164fc
--- /dev/null
+++ b/mock-server/src/main/resources/static/css/mock.css
@@ -0,0 +1,3 @@
+.hidden{
+    display: none;
+}
\ No newline at end of file
diff --git a/mock-server/src/main/resources/static/images/favicon.ico b/mock-server/src/main/resources/static/images/favicon.ico
new file mode 100644
index 0000000..997406a
Binary files /dev/null and b/mock-server/src/main/resources/static/images/favicon.ico differ
diff --git a/mock-server/src/main/webapp/scripts/mock-js.js b/mock-server/src/main/resources/static/js/mock-js.js
similarity index 90%
rename from mock-server/src/main/webapp/scripts/mock-js.js
rename to mock-server/src/main/resources/static/js/mock-js.js
index 2e786c3..53d1116 100644
--- a/mock-server/src/main/webapp/scripts/mock-js.js
+++ b/mock-server/src/main/resources/static/js/mock-js.js
@@ -1,22 +1,28 @@
 $(document).ready(function() {
     var codes = [{key:"200 OK",val:200},
-    			{key:"201",val:201},
-    			{key:"404 Not Found",val:400}];
+    			{key:"201 Created",val:201},
+    			{key:"404 Not Found",val:404},
+    			{key:"403 Forbidden",val:403},
+    			{key:"400 Bad Request",val:400},
+    			{key:"500 Internal Server Error",val:500},
+    			{key:"501 Not Implemented",val:501},
+    			{key:"502 Bad Gateway",val:502},
+    			{key:"503 Service Unavailable",val:503}];
     var ctypes = ["application/json","application/xml","text/json","text/xml"];
     var encodings = ["UTF-8","UTF-16"];
-    
+
     var option = '';
     for (var i = 0; i < codes.length; i++){
        option += '<option value="'+ codes[i].val + '">' + codes[i].key + '</option>';
     }
     $('#statusCodes').append(option);
-    
+
     option = '';
     for (var i = 0; i < ctypes.length; i++){
        option += '<option value="'+ ctypes[i] + '">' + ctypes[i] + '</option>';
     }
     $('#ctypes').append(option);
-    
+
     option = '';
     for (var i = 0; i < encodings.length; i++){
         option += '<option value="'+ encodings[i] + '">' + encodings[i] + '</option>';
@@ -25,14 +31,14 @@ $(document).ready(function() {
 
     var wrapper = $(".headersTemplate"); //Fields wrapper
     var i = 0;
-    $(".addButton").click(function(){ 
+    $(".addButton").click(function(){
     	i++;
         $(wrapper).append('<div class="form-inline"><br><input type="text" class="form-control" name="headers['+i+'][name]"  placeholder="Header Name"/> : <input type="text" class="form-control" name="headers['+i+'][value]" placeholder="Header Value" /> <button type="button" class="btn btn-danger removeButton">Delete</button></div>'); //add input box
     });
     $(wrapper).on("click",".removeButton", function(){ //user click on remove text
         $(this).parent('div').remove();
     });
-    
+
     (function($){
         $.fn.serializeObject = function(){
 
@@ -99,16 +105,16 @@ $(document).ready(function() {
             return json;
         };
     })(jQuery);
-    
+
     $("#mockForm").submit(function(e) {
     	e.preventDefault();
-    	
+
     	var request = JSON.stringify($(this).serializeObject());
-    	
+
     	console.log(request);
-    	
+
         $.ajax({
-                url: '/save',
+                url: '/api/save/response',
                 type: 'POST',
                 contentType: "application/json",
                 data: request,
diff --git a/mock-server/src/main/resources/templates/error.html b/mock-server/src/main/resources/templates/error.html
new file mode 100644
index 0000000..53e8b6a
--- /dev/null
+++ b/mock-server/src/main/resources/templates/error.html
@@ -0,0 +1,17 @@
+<html lang="en">
+<head><title>Error Occurred</title></head>
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
+
+    <!-- Optional theme -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css" integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
+
+    <!-- Latest compiled and minified JavaScript -->
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>
+<body>
+<h1>Error Occurred!</h1>
+<b>[<span th:text="${status}">status</span>]
+    <span th:text="${error}">error</span>
+</b>
+<p th:text="${message}">message</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/mock-server/src/main/resources/templates/index.html b/mock-server/src/main/resources/templates/index.html
new file mode 100644
index 0000000..a43f5a4
--- /dev/null
+++ b/mock-server/src/main/resources/templates/index.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html xmlns:th="https://www.thymeleaf.org">
+<head lang="en">
+    <meta charset="UTF-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>MockServer</title>
+<!-- CSS only -->
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
+<link rel="stylesheet" href="css/mock.css">
+<!-- JS, Popper.js, and jQuery -->
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
+<script src="js/mock-js.js" type="text/javascript"></script>
+</head>
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <a class="navbar-brand" href="/"><span th:text="${appName}">appName</span></a>
+</nav>
+<div role="main" class="container">
+    <div class="starter-template">
+        <h2>
+            <span th:text="'Hello, Welcome to ' + ${appName} + '!'"></span>
+        </h2>
+    </div>
+    <div>
+        <form id="mockForm" class="form-horizontal" method="post">
+            <div class="form-group">
+                  <div id="result" class="hidden">
+                    <div class="panel panel-success">
+                        <div class="panel-heading">Your mock link is ready!</div>
+                        <div class="panel-body"></div>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <div class="col-sm-6" >
+                        <label class="center-block">Status Code:</label>
+                        <select id="statusCodes" class="form-control" name="statusCode"></select>
+                    </div>
+                    <div class="col-sm-6" >
+                        <label class="center-block">Content Type:</label>
+                        <select id="ctypes" class="form-control" name="contentType"></select>
+                    </div>
+                </div>
+
+                <br>
+
+                <div class="row">
+                    <div class="col-sm-6" >
+                        <label class="center-block">Encoding:</label>
+                        <select id="encodings" class="form-control" name="encoding"></select>
+                    </div>
+                    <div class="col-sm-6" >
+                        <label class="center-block">Delay (in ms):</label>
+                        <input type="number" id="delay" value=0 class="form-control" name="delay"></input>
+                    </div>
+                </div>
+
+                <br>
+
+                <label class="form-inline">Headers:</label>
+                <div class="form-inline headersTemplate">
+                    <input type="text" class="form-control" name="headers[0][name]" placeholder="Header Name" /> :
+                    <input type="text" class="form-control" name="headers[0][value]" placeholder="Header Value" />
+                    <button type="button" class="btn btn-success addButton">Add</button>
+                </div>
+
+                <br>
+
+                <label class="center-block">Body:</label>
+                <textarea rows="5" class="form-control" name="body"></textarea>
+
+            </div>
+
+            <button type="submit" class="btn btn-primary form-group" >Submit</button>
+
+
+
+            <div id="errorResult" class="hidden form-group">
+                <h2>Uh-oh! Can't connect to the server!</h2>
+            </div>
+
+        </form>
+    </div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/mock-server/src/main/webapp/WEB-INF/view/welcome.jsp b/mock-server/src/main/webapp/WEB-INF/view/welcome.jsp
deleted file mode 100644
index 8aa6420..0000000
--- a/mock-server/src/main/webapp/WEB-INF/view/welcome.jsp
+++ /dev/null
@@ -1,78 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="application/json; charset=UTF-8">
-<link rel="stylesheet"
-      href="https://unpkg.com/bootstrap@3.3.7/dist/css/bootstrap.min.css">
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-<script src="../scripts/mock-js.js" type="text/javascript"></script>      
-
-</head>
-<body>
-
-	<div class="container">
-		<form id="mockForm" class="form-horizontal" method="post">
-	        <div class="form-group">
-	        	<h1>Welcome to Mock-Server!</h1>
-	        	
-	        	<div id="result" class="hidden">
-	        	  <div class="panel panel-success">
-				      <div class="panel-heading">Your mock link is ready!</div>
-				      <div class="panel-body"></div>
-				  </div>
-				</div>
-	        	
-	        	<div class="row">
-				    <div class="col-sm-6" >
-				    	<label class="center-block">Status Code:</label>
-		     			<select id="statusCodes" class="form-control" name="statusCode"></select>
-				    </div>
-				    <div class="col-sm-6" >
-				    	<label class="center-block">Content Type:</label>
-			   			<select id="ctypes" class="form-control" name="contentType"></select>
-				    </div>
-				</div>
-				
-				<br>
-				
-				<div class="row">
-				    <div class="col-sm-6" >
-				    	<label class="center-block">Encoding:</label>
-			    		<select id="encodings" class="form-control" name="encoding"></select>
-				    </div>
-				    <div class="col-sm-6" >
-				    	<label class="center-block">Delay (in ms):</label>
-			   			<input type="number" id="delay" value=0 class="form-control" name="delay"></input>
-				    </div>
-				</div>
-				
-				<br>
-			    
-			    <label class="form-inline">Headers:</label>
-			    <div class="form-inline headersTemplate">
-		            <input type="text" class="form-control" name="headers[0][name]" placeholder="Header Name" /> :
-		            <input type="text" class="form-control" name="headers[0][value]" placeholder="Header Value" />
-		            <button type="button" class="btn btn-success addButton">Add</button>
-			    </div>
-			    
-			    <br>
-				
-				<label class="center-block">Body:</label>
-			    <textarea rows="5" class="form-control" name="body"></textarea>
-			    
-			</div>
-			
-			<button type="submit" class="btn btn-primary form-group" >Submit</button>
-			
-			
-			
-			<div id="errorResult" class="hidden form-group">
-			  <h2>Uh-oh! Can't connect to the server!</h2>
-			</div>
-		
-		</form>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/mock-server/src/main/webapp/WEB-INF/web.xml b/mock-server/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9f88c1f..0000000
--- a/mock-server/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-<web-app>
-  <display-name>Archetype Created Web Application</display-name>
-</web-app>