diff --git a/spring-boot-datatable/pom.xml b/spring-boot-datatable/pom.xml
index 938912f..765944e 100644
--- a/spring-boot-datatable/pom.xml
+++ b/spring-boot-datatable/pom.xml
@@ -46,20 +46,26 @@
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 			<version>2.6.2</version>
-		</dependency>
+		</dependency>  
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>5.1.36</version>
 		</dependency>
 
-
 		<!-- https://mvnrepository.com/artifact/oracle/ojdbc6 -->
+		<!--  
 		<dependency>
 			<groupId>com.oracle</groupId>
 			<artifactId>ojdbc6</artifactId>
 			<version>11.2.0</version>
 		</dependency>
+		-->
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 
 	</dependencies>
 
diff --git a/spring-boot-datatable/src/main/java/com/opencodez/controllers/BaseController.java b/spring-boot-datatable/src/main/java/com/opencodez/controllers/BaseController.java
index ed9f49b..6d29ba2 100644
--- a/spring-boot-datatable/src/main/java/com/opencodez/controllers/BaseController.java
+++ b/spring-boot-datatable/src/main/java/com/opencodez/controllers/BaseController.java
@@ -1,154 +1,116 @@
-/**
- * 
- */
-package com.opencodez.controllers;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.google.gson.Gson;
-import com.opencodez.domain.User;
-import com.opencodez.domain.UserModel;
-import com.opencodez.domain.pagination.DataTableRequest;
-import com.opencodez.domain.pagination.DataTableResults;
-import com.opencodez.domain.pagination.PaginationCriteria;
-import com.opencodez.repo.GenericRepo;
-import com.opencodez.repo.UserRepository;
-import com.opencodez.util.AppUtil;
-
-/**
- * @author pavan.solapure
- *
- */
-@Controller
-public class BaseController {
-
-	@Autowired
-	private UserRepository userRepo;
-	
-	@Autowired
-	private GenericRepo genericRepo;
-	
-	/** The entity manager. */
-	@PersistenceContext
-	private EntityManager entityManager;
-	
-		
-	@RequestMapping(value="/", method = RequestMethod.GET)
-	public ModelAndView home(@RequestParam(value = "name", defaultValue = "World") String name) {
-		ModelAndView mv = new ModelAndView("index");
-		mv.addObject("userModel", new UserModel());
-		List<UserModel> userList  = genericRepo.getUserModel();
-		mv.addObject("userlist", userList);
-		return mv;
-	}
-	
-	@RequestMapping(value="/users/mysql", method=RequestMethod.GET)
-	public String listUsers(Model model) {
-		return "users_mysql";
-	}
-	
-	@RequestMapping(value="/users/paginated/mysql", method=RequestMethod.GET)
-	@ResponseBody
-	public String listUsersPaginated(HttpServletRequest request, HttpServletResponse response, Model model) {
-		
-		DataTableRequest<User> dataTableInRQ = new DataTableRequest<User>(request);
-		PaginationCriteria pagination = dataTableInRQ.getPaginationRequest();
-		
-		String baseQuery = "SELECT USER_ID as id, USER_NAME as name, SALARY as salary, (SELECT COUNT(1) FROM MYUSERS) AS total_records  FROM MYUSERS";
-		String paginatedQuery = AppUtil.buildPaginatedQuery(baseQuery, pagination);
-		
-		System.out.println(paginatedQuery);
-		
-		Query query = entityManager.createNativeQuery(paginatedQuery, UserModel.class);
-		
-		@SuppressWarnings("unchecked")
-		List<UserModel> userList = query.getResultList();
-		
-		DataTableResults<UserModel> dataTableResult = new DataTableResults<UserModel>();
-		dataTableResult.setDraw(dataTableInRQ.getDraw());
-		dataTableResult.setListOfDataObjects(userList);
-		if (!AppUtil.isObjectEmpty(userList)) {
-			dataTableResult.setRecordsTotal(userList.get(0).getTotalRecords()
-					.toString());
-			if (dataTableInRQ.getPaginationRequest().isFilterByEmpty()) {
-				dataTableResult.setRecordsFiltered(userList.get(0).getTotalRecords()
-						.toString());
-			} else {
-				dataTableResult.setRecordsFiltered(Integer.toString(userList.size()));
-			}
-		}
-		return new Gson().toJson(dataTableResult);
-	}
-	
-	@RequestMapping(value="/users/oracle", method=RequestMethod.GET)
-	public String listUsersOracle(Model model) {
-		return "users";
-	}
-	
-	@RequestMapping(value="/users/paginated/orcl", method=RequestMethod.GET)
-	@ResponseBody
-	public String listUsersPaginatedForOracle(HttpServletRequest request, HttpServletResponse response, Model model) {
-		
-		DataTableRequest<User> dataTableInRQ = new DataTableRequest<User>(request);
-		PaginationCriteria pagination = dataTableInRQ.getPaginationRequest();
-		String baseQuery = "SELECT USER_ID as id, USER_NAME as name, SALARY as salary  FROM MYUSERS";
-		String paginatedQuery = AppUtil.buildPaginatedQueryForOracle(baseQuery, pagination);
-		
-		System.out.println(paginatedQuery);
-		
-		Query query = entityManager.createNativeQuery(paginatedQuery, UserModel.class);
-		
-		@SuppressWarnings("unchecked")
-		List<UserModel> userList = query.getResultList();
-		
-		DataTableResults<UserModel> dataTableResult = new DataTableResults<UserModel>();
-		dataTableResult.setDraw(dataTableInRQ.getDraw());
-		dataTableResult.setListOfDataObjects(userList);
-		if (!AppUtil.isObjectEmpty(userList)) {
-			dataTableResult.setRecordsTotal(userList.get(0).getTotalRecords()
-					.toString());
-			if (dataTableInRQ.getPaginationRequest().isFilterByEmpty()) {
-				dataTableResult.setRecordsFiltered(userList.get(0).getTotalRecords()
-						.toString());
-			} else {
-				dataTableResult.setRecordsFiltered(Integer.toString(userList.size()));
-			}
-		}
-		return new Gson().toJson(dataTableResult);
-	}
-	
-	@RequestMapping(value="/adduser", method=RequestMethod.POST)
-	public String addUser(@ModelAttribute UserModel userModel, Model model) {
-		if(null != userModel) {
-			
-			if(!AppUtil.isObjectEmpty(userModel.getId()) && 
-					!AppUtil.isObjectEmpty(userModel.getName()) && 
-					!AppUtil.isObjectEmpty(userModel.getSalary())) {
-				
-				User u = new User();
-				u.setId(userModel.getId());
-				u.setName(userModel.getName());
-				u.setSalary(userModel.getSalary());
-				userRepo.save(u);
-			}
-		}
-		return "redirect:/";
-	}
-
-}
+/**
+ * 
+ */
+package com.opencodez.controllers;
+
+import java.util.List;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+import com.google.gson.Gson;
+import com.opencodez.domain.User;
+import com.opencodez.domain.pagination.DataTableRequest;
+import com.opencodez.domain.pagination.DataTableResults;
+import com.opencodez.domain.pagination.PaginationCriteria;
+import com.opencodez.repo.UserRepository;
+import com.opencodez.util.AppUtil;
+
+/**
+ * @author pavan.solapure
+ *
+ */
+@Controller
+public class BaseController {
+	@Autowired
+	private UserRepository userRepo;
+	
+	/** The entity manager. */
+	@PersistenceContext
+	private EntityManager entityManager;
+	
+	@RequestMapping(value="/", method = RequestMethod.GET)
+	public ModelAndView home(@RequestParam(value = "name", defaultValue = "World") String name) {
+		ModelAndView mv = new ModelAndView("index");
+		mv.addObject("userModel", new User());
+		List<User> userList = userRepo.findAll();		
+		mv.addObject("userlist", userList);
+		return mv;
+	}
+
+	@RequestMapping(value="/users", method=RequestMethod.GET)
+	public String listUsersOracle(Model model) {
+		return "users";
+	}
+	
+	@RequestMapping(value="/users/paginated", method=RequestMethod.GET)
+	@ResponseBody
+	public String listUsersPaginatedForOracle(HttpServletRequest request, HttpServletResponse response, Model model) {
+		DataTableRequest<User> dataTableInRQ = new DataTableRequest<User>(request);
+		String sortBy = dataTableInRQ.getOrder().getData();				
+		Direction dir = Direction.fromString(dataTableInRQ.getOrder().getSortDir());		
+		Sort sort = new Sort(new Sort.Order(dir, sortBy));
+		
+		Integer pageNo =(Integer.parseInt(request.getParameter(PaginationCriteria.PAGE_NO)));
+		Integer pageSize = (Integer.parseInt(request.getParameter(PaginationCriteria.PAGE_SIZE)));		
+		Pageable pageable = new PageRequest(pageNo / pageSize, pageSize, sort);				
+        
+		Page<User> page = userRepo.findAll(pageable);
+		
+		Integer totalRecords = (int)page.getTotalElements();
+		
+        List<User> userList = page.getContent();
+        for(User user : userList) {
+        	user.setTotalRecords(totalRecords);
+        }        
+        
+		DataTableResults<User> dataTableResult = new DataTableResults<User>();
+		
+		dataTableResult.setDraw(dataTableInRQ.getDraw());
+		dataTableResult.setListOfDataObjects(userList);
+		if (!AppUtil.isObjectEmpty(userList)) {
+			dataTableResult.setRecordsTotal(userList.get(0).getTotalRecords()
+					.toString());
+			if (dataTableInRQ.getPaginationRequest().isFilterByEmpty()) {
+				dataTableResult.setRecordsFiltered(userList.get(0).getTotalRecords()
+						.toString());
+			} else {
+				dataTableResult.setRecordsFiltered(Integer.toString(userList.size()));
+			}
+		}
+		return new Gson().toJson(dataTableResult);
+	}
+	
+	@RequestMapping(value="/adduser", method=RequestMethod.POST)
+	public String addUser(@ModelAttribute User userModel, Model model) {
+		if(null != userModel) {
+			
+			if(!AppUtil.isObjectEmpty(userModel.getId()) && 
+					!AppUtil.isObjectEmpty(userModel.getName()) && 
+					!AppUtil.isObjectEmpty(userModel.getSalary())) {
+				
+				User u = new User();
+				u.setId(userModel.getId());
+				u.setName(userModel.getName());
+				u.setSalary(userModel.getSalary());
+				userRepo.save(u);
+			}
+		}
+		return "redirect:/";
+	}
+
+}
diff --git a/spring-boot-datatable/src/main/java/com/opencodez/domain/User.java b/spring-boot-datatable/src/main/java/com/opencodez/domain/User.java
index a37d6d4..ec7883b 100644
--- a/spring-boot-datatable/src/main/java/com/opencodez/domain/User.java
+++ b/spring-boot-datatable/src/main/java/com/opencodez/domain/User.java
@@ -7,6 +7,7 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @author pavan.solapure
@@ -24,8 +25,10 @@ public class User {
 	private String name;
 	
 	@Column(name = "SALARY")
-	private String salary;
-
+	private Integer salary;
+	
+	@Transient
+	private Integer totalRecords;
 	
 	/**
 	 * @return the id
@@ -54,25 +57,20 @@ public void setName(String name) {
 	/**
 	 * @return the salary
 	 */
-	public String getSalary() {
+	public Integer getSalary() {
 		return salary;
 	}
 	/**
 	 * @param salary the salary to set
 	 */
-	public void setSalary(String salary) {
+	public void setSalary(Integer salary) {
 		this.salary = salary;
 	}
-//	/**
-//	 * @return the totalRecords
-//	 */
-//	public Integer getTotalRecords() {
-//		return totalRecords;
-//	}
-//	/**
-//	 * @param totalRecords the totalRecords to set
-//	 */
-//	public void setTotalRecords(Integer totalRecords) {
-//		this.totalRecords = totalRecords;
-//	}
+
+	public Integer getTotalRecords() {
+		return totalRecords;
+	}
+	public void setTotalRecords(Integer totalRecords) {
+		this.totalRecords = totalRecords;
+	}	
 }
diff --git a/spring-boot-datatable/src/main/java/com/opencodez/domain/UserModel.java b/spring-boot-datatable/src/main/java/com/opencodez/domain/UserModel.java
deleted file mode 100644
index 8bdfa76..0000000
--- a/spring-boot-datatable/src/main/java/com/opencodez/domain/UserModel.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 
- */
-package com.opencodez.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Transient;
-
-/**
- * @author pavan.solapure
- *
- */
-@Entity
-public class UserModel {
-
-	@Id
-	private Long id;
-	private String name;
-	private String salary;
-
-	private Integer totalRecords;
-
-	@Transient
-	private Integer rn;
-
-	/**
-	 * @return the id
-	 */
-	public Long getId() {
-		return id;
-	}
-
-	/**
-	 * @param id
-	 *            the id to set
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name
-	 *            the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return the salary
-	 */
-	public String getSalary() {
-		return salary;
-	}
-
-	/**
-	 * @param salary
-	 *            the salary to set
-	 */
-	public void setSalary(String salary) {
-		this.salary = salary;
-	}
-
-	/**
-	 * @return the totalRecords
-	 */
-	public Integer getTotalRecords() {
-		return totalRecords;
-	}
-
-	/**
-	 * @param totalRecords
-	 *            the totalRecords to set
-	 */
-	public void setTotalRecords(Integer totalRecords) {
-		this.totalRecords = totalRecords;
-	}
-
-	public Integer getRn() {
-		return rn;
-	}
-
-	public void setRn(Integer rn) {
-		this.rn = rn;
-	}
-
-}
diff --git a/spring-boot-datatable/src/main/java/com/opencodez/repo/GenericRepo.java b/spring-boot-datatable/src/main/java/com/opencodez/repo/GenericRepo.java
deleted file mode 100644
index 195912b..0000000
--- a/spring-boot-datatable/src/main/java/com/opencodez/repo/GenericRepo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * 
- */
-package com.opencodez.repo;
-
-import java.util.List;
-
-import com.opencodez.domain.UserModel;
-
-/**
- * @author pavan.solapure
- *
- */
-public interface GenericRepo {
-	
-	List<UserModel> getUserModel();
-	
-	
-}
diff --git a/spring-boot-datatable/src/main/java/com/opencodez/repo/GenericRepoImpl.java b/spring-boot-datatable/src/main/java/com/opencodez/repo/GenericRepoImpl.java
deleted file mode 100644
index 6debe1d..0000000
--- a/spring-boot-datatable/src/main/java/com/opencodez/repo/GenericRepoImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 
- */
-package com.opencodez.repo;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.springframework.stereotype.Repository;
-
-import com.opencodez.domain.UserModel;
-
-/**
- * @author pavan.solapure
- *
- */
-@Repository
-public class GenericRepoImpl implements GenericRepo {
-	
-	@PersistenceContext
-	private EntityManager entityManager;
-
-	/* (non-Javadoc)
-	 * @see com.opencodez.repo.GenericRepo#getUserModel()
-	 */
-	@Override
-	public List<UserModel> getUserModel() {
-
-		String qry = "SELECT USER_ID as id, USER_NAME as name, salary as salary, 1 as total_records FROM MYUSERS";
-		Query query = entityManager.createNativeQuery(qry,
-				UserModel.class);
-
-		@SuppressWarnings("unchecked")
-		List<UserModel> daoDtolist = query.getResultList();
-		
-		return daoDtolist;
-	}
-
-}
diff --git a/spring-boot-datatable/src/main/java/com/opencodez/repo/UserRepository.java b/spring-boot-datatable/src/main/java/com/opencodez/repo/UserRepository.java
index 04b8a58..23600ca 100644
--- a/spring-boot-datatable/src/main/java/com/opencodez/repo/UserRepository.java
+++ b/spring-boot-datatable/src/main/java/com/opencodez/repo/UserRepository.java
@@ -1,21 +1,8 @@
-/**
- * 
- */
 package com.opencodez.repo;
 
-import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
 import com.opencodez.domain.User;
 
-/**
- * @author pavan.solapure
- *
- */
-public interface UserRepository extends JpaRepository<User, Long> {
-	
-	@Query(value = "SELECT * FROM MYUSERS", nativeQuery = true)
-	List<User> findAllByUsernames(List<String> listOfUsernames);
+public interface UserRepository extends JpaRepository<User, Integer>  {
+
 }
diff --git a/spring-boot-datatable/src/main/resources/application.properties b/spring-boot-datatable/src/main/resources/application.properties
index c8247ce..e206ad5 100644
--- a/spring-boot-datatable/src/main/resources/application.properties
+++ b/spring-boot-datatable/src/main/resources/application.properties
@@ -1,10 +1,14 @@
+server.port = 8090
 spring.thymeleaf.cache=false
 
-spring.datasource.url=jdbc:mysql://localhost:3306/localdb
-spring.datasource.username=lessroot
-spring.datasource.password=lessroot
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.jpa.properties.javax.persistence.validation.mode=none
+# Enabling H2 Console
+spring.h2.console.enabled=false
+
+#spring.datasource.url=jdbc:mysql://localhost:3306/localdb
+#spring.datasource.username=lessroot
+#spring.datasource.password=lessroot
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.jpa.properties.javax.persistence.validation.mode=none
 
 #spring.datasource.url=jdbc:oracle:thin:@localhost:1521:xe
 #spring.datasource.username=pavans
diff --git a/spring-boot-datatable/src/main/resources/data.sql b/spring-boot-datatable/src/main/resources/data.sql
new file mode 100644
index 0000000..3c79090
--- /dev/null
+++ b/spring-boot-datatable/src/main/resources/data.sql
@@ -0,0 +1,20 @@
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('1', 'user1', 100);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('2', 'user2', 200);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('3', 'user3', 300);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('4', 'user4', 400);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('5', 'user5', 500);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('6', 'user6', 600);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('7', 'user7', 700);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('8', 'user8', 800);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('9', 'user9', 900);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('10', 'user10', 1000);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('11', 'user11', 1100);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('12', 'user12', 1200);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('13', 'user13', 1300);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('14', 'user14', 1400);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('15', 'user15', 1500);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('16', 'user16', 1600);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('17', 'user17', 1700);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('18', 'user18', 1800);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('19', 'user19', 1900);
+INSERT INTO MYUSERS (USER_ID, USER_NAME, SALARY) VALUES ('20', 'user20', 2000);
\ No newline at end of file
diff --git a/spring-boot-datatable/src/main/resources/static/js/admin.js b/spring-boot-datatable/src/main/resources/static/js/admin.js
index 74c86d6..bafcb14 100644
--- a/spring-boot-datatable/src/main/resources/static/js/admin.js
+++ b/spring-boot-datatable/src/main/resources/static/js/admin.js
@@ -4,7 +4,7 @@ $( document ).ready(function() {
         "serverSide": true,
         "pageLength": 5,
         "ajax": {
-            "url": "/users/paginated/orcl",
+            "url": "/users/paginated",
             "data": function ( data ) {
 			 //process data before sent to server.
          }},
diff --git a/spring-boot-datatable/src/main/resources/static/js/admin_mysql.js b/spring-boot-datatable/src/main/resources/static/js/admin_mysql.js
deleted file mode 100644
index 109e9dc..0000000
--- a/spring-boot-datatable/src/main/resources/static/js/admin_mysql.js
+++ /dev/null
@@ -1,19 +0,0 @@
-$( document ).ready(function() {
-	$('#paginatedTable').DataTable( {
-        "processing": true,
-        "serverSide": true,
-        "pageLength": 5,
-        "ajax": {
-            "url": "/users/paginated/mysql",
-            "data": function ( data ) {
-			 //process data before sent to server.
-         }},
-        "columns": [
-                    { "data": "id", "name" : "ID", "title" : "ID"  },
-                    { "data": "name", "name" : "Name" , "title" : "Name"},
-                    { "data": "salary", "name" : "Salary" , "title" : "Salary"}
-                ]    
-	});
-	
-	$('#paginatedTable').dataTable().fnSetFilteringEnterPress();
-});
\ No newline at end of file
diff --git a/spring-boot-datatable/src/main/resources/templates/index.html b/spring-boot-datatable/src/main/resources/templates/index.html
index dc346cc..312c80b 100644
--- a/spring-boot-datatable/src/main/resources/templates/index.html
+++ b/spring-boot-datatable/src/main/resources/templates/index.html
@@ -54,9 +54,7 @@ <h3 class="panel-title">Add User Data</h3>
 		</form>
   </div>
 </div>
-<a href="/users/oracle">Paginated List using Oracle</a> 
-<br/>
-<a href="/users/mysql">Paginated List using MySQL</a>
+<a href="/users">Paginated List</a>
 </div>
 
 <div class="col-md-6">
diff --git a/spring-boot-datatable/src/main/resources/templates/users_mysql.html b/spring-boot-datatable/src/main/resources/templates/users_mysql.html
deleted file mode 100644
index 3f509ed..0000000
--- a/spring-boot-datatable/src/main/resources/templates/users_mysql.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<title>Home</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet" media="screen" />
-
-<link th:href="@{../css/starter-template.css}" rel="stylesheet" media="screen" />
-<link th:href="@{../css/datatables.min.css}" rel="stylesheet" media="screen" />
-
-<script
-  src="https://code.jquery.com/jquery-3.1.1.min.js"
-  integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="
-  crossorigin="anonymous"></script>
-
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<script type="text/javascript" th:src="@{../js/admin_mysql.js}"></script>
-<script type="text/javascript" 	th:src="@{../js/datatables.min.js}"></script>
-<script type="text/javascript" 	th:src="@{../js/fnSetFilteringEnterPress.js}"></script>
-
-</head>
-<body>
-
-    <nav class="navbar navbar-inverse navbar-fixed-top">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="#">Datatable Demo</a>
-        </div>
-        
-      </div>
-    </nav>
-
-    <div class="container">
-
-      <div class="starter-template">
-      
-      
-			<div class="table-responsive">
-		        <table id="paginatedTable" class="table table-striped">
-		            <thead>
-		                <tr>
-		                    <th>Id</th>
-		                    <th>Name</th>
-		                    <th>Salary</th>
-		                </tr>
-		            </thead>
-
-		        </table>
-		       </div>
-      
-      
-      </div>
-
-    </div><!-- /.container -->
-
-</body>
-</html>
\ No newline at end of file