diff --git a/repository/pom.xml b/repository/pom.xml
index 573f49d1e..386a21c52 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -28,5 +28,14 @@
 			<artifactId>postgresql</artifactId>
 			<version>9.4-1200-jdbc4</version>
 		</dependency>
+		<dependency>
+	  		<groupId>commons-dbcp</groupId>
+	  		<artifactId>commons-dbcp</artifactId>
+	  		<version>1.4</version>
+	  	</dependency>		
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/repository/src/main/java/com/iluwatar/App.java b/repository/src/main/java/com/iluwatar/App.java
index 0408cd7c2..3dac5647e 100644
--- a/repository/src/main/java/com/iluwatar/App.java
+++ b/repository/src/main/java/com/iluwatar/App.java
@@ -4,11 +4,6 @@ import java.util.List;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-/**
- * Standalone application with Spring Data JPA, Hibernate and Maven
- * 
- * @author DevCrumb.com
- */
 public class App {
 	public static void main(String[] args) {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
diff --git a/repository/src/main/java/com/iluwatar/Person.java b/repository/src/main/java/com/iluwatar/Person.java
index bd2ebf43a..22495b926 100644
--- a/repository/src/main/java/com/iluwatar/Person.java
+++ b/repository/src/main/java/com/iluwatar/Person.java
@@ -4,11 +4,6 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
-/**
- * Person entity
- * 
- * @author DevCrumb.com
- */
 @Entity
 public class Person {
 
diff --git a/repository/src/main/java/com/iluwatar/PersonDao.java b/repository/src/main/java/com/iluwatar/PersonDao.java
index 66b625782..6b0c0081a 100644
--- a/repository/src/main/java/com/iluwatar/PersonDao.java
+++ b/repository/src/main/java/com/iluwatar/PersonDao.java
@@ -5,11 +5,6 @@ import java.util.List;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
-/**
- * Person dao interface
- * 
- * @author DevCrumb.com
- */
 @Repository
 public interface PersonDao extends CrudRepository<Person, Long> {
 	
diff --git a/repository/src/main/resources/META-INF/persistence.xml b/repository/src/main/resources/META-INF/persistence.xml
index 4c1478e55..0aded0dbd 100644
--- a/repository/src/main/resources/META-INF/persistence.xml
+++ b/repository/src/main/resources/META-INF/persistence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="1.0"
-    xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+	xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
 
 	<persistence-unit name="jpaData" />
 
-</persistence>
\ No newline at end of file
+</persistence>
diff --git a/repository/src/main/resources/applicationContext.xml b/repository/src/main/resources/applicationContext.xml
index c7c4179d2..d68207f31 100644
--- a/repository/src/main/resources/applicationContext.xml
+++ b/repository/src/main/resources/applicationContext.xml
@@ -7,45 +7,34 @@
 	xsi:schemaLocation="
 				http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
 				http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.0.xsd">
-	
+
 	<!-- Directory to scan for repository classes -->
 	<jpa:repositories base-package="com.iluwatar" />
-	
-	<bean id="dataSource"
-        class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName">
-            <value>org.postgresql.Driver</value>
-        </property>
-        <property name="url">
-            <value>jdbc:postgresql://localhost:5432/postgres</value>
-        </property>
-        <property name="username">
-            <value>postgres</value>
-        </property>
-        <property name="password">
-            <value>ile666</value>
-        </property>
-    </bean>
- 
-    <bean id="entityManagerFactory"
-        class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-        <property name="dataSource" ref="dataSource" />
-        <property name="persistenceUnitName" value="jpaData" />
-        <property name="jpaVendorAdapter">
-            <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
-        </property>
-        <property name="jpaProperties">
-            <props>
-                <prop key="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</prop>
-                <prop key="hibernate.show_sql">false</prop>
-                <prop key="hibernate.format_sql">false</prop>
-                <prop key="hibernate.hbm2ddl.auto">create</prop>
-            </props>
-        </property>
-    </bean>
 
 	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
 		<property name="entityManagerFactory" ref="entityManagerFactory" />
 	</bean>
 
-</beans>
\ No newline at end of file
+	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
+		destroy-method="close">
+		<property name="driverClassName" value="org.h2.Driver" />
+		<property name="url" value="jdbc:h2:~/databases/person" />
+		<property name="username" value="sa" />
+		<property name="password" value="sa" />
+	</bean>
+
+	<bean id="entityManagerFactory"
+		class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+		<property name="packagesToScan" value="com.iluwatar" />
+		<property name="persistenceProvider">
+			<bean class="org.hibernate.ejb.HibernatePersistence" />
+		</property>
+		<property name="jpaProperties">
+			<map>
+				<entry key="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
+				<entry key="hibernate.hbm2ddl.auto" value="update" />
+			</map>
+		</property>
+	</bean>
+</beans>