diff --git a/h2.sh b/h2.sh
new file mode 100755
index 0000000..6af14b2
--- /dev/null
+++ b/h2.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# This script will give you H2 database shell
+
+java -cp lib/default/h2*.jar org.h2.tools.Shell -url 'jdbc:h2:.simple-java;AUTO_SERVER=TRUE' -user sa -password sa
diff --git a/ivy.xml b/ivy.xml
index e462bc8..ef69d67 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -12,6 +12,11 @@
   <dependencies defaultconf="default->default">
       <dependency org="org.eclipse.jetty" name="jetty-server" rev="8.0+"/>
       <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="8.0+"/>
+      <dependency org="org.eclipse.jetty" name="jetty-plus" rev="8.0+"/>
+
+      <dependency org="com.h2database" name="h2" rev="1.3+"/>
+      <dependency org="commons-dbcp" name="commons-dbcp" rev="1.4"/>
+      <dependency org="org.liquibase" name="liquibase-core" rev="2.0+"/>
 
       <dependency org="org.springframework" name="spring-beans" rev="3.0+"/>
       <dependency org="org.springframework" name="spring-web" rev="3.0+"/>
diff --git a/src/ee/devclub/model/PhotoSpot.java b/src/ee/devclub/model/PhotoSpot.java
index c0162b5..c97627e 100644
--- a/src/ee/devclub/model/PhotoSpot.java
+++ b/src/ee/devclub/model/PhotoSpot.java
@@ -1,6 +1,7 @@
 package ee.devclub.model;
 
 public class PhotoSpot {
+    Long id;
     String name;
     String description;
     Location location;
diff --git a/webapp/WEB-INF/jetty-web.xml b/webapp/WEB-INF/jetty-web.xml
new file mode 100644
index 0000000..c96c629
--- /dev/null
+++ b/webapp/WEB-INF/jetty-web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext">
+    <Set name="contextPath">/</Set>
+
+    <New id="dataSource" class="org.eclipse.jetty.plus.jndi.Resource">
+        <Arg>jdbc/ds</Arg>
+        <Arg>
+            <New class="org.apache.commons.dbcp.BasicDataSource">
+                <Set name="testOnBorrow">true</Set>
+                <Set name="url">jdbc:h2:.simple-java;AUTO_SERVER=TRUE;USER=sa;PASSWORD=sa</Set>
+                <Set name="maxActive">5</Set>
+                <Set name="maxIdle">5</Set>
+                <Set name="defaultAutoCommit">false</Set>
+            </New>
+        </Arg>
+    </New>
+
+    <Call class="org.eclipse.jetty.util.log.Log" name="info">
+        <Arg>Processed jetty-web.xml</Arg>
+    </Call>
+</Configure>
\ No newline at end of file
diff --git a/webapp/WEB-INF/liquibase.xml b/webapp/WEB-INF/liquibase.xml
new file mode 100644
index 0000000..afe7701
--- /dev/null
+++ b/webapp/WEB-INF/liquibase.xml
@@ -0,0 +1,15 @@
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">
+
+    <changeSet id="20110823" author="Codeborne">
+        <createTable tableName="PhotoSpot">
+            <column name="id" type="integer" autoIncrement="true"><constraints primaryKey="true"/></column>
+            <column name="name" type="char(200)"/>
+            <column name="description" type="text"/>
+            <column name="lat" type="float"/>
+            <column name="lon" type="float"/>
+            <column name="createdAt" type="timestamp" defaultValueComputed="now()"/>
+        </createTable>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/webapp/WEB-INF/spring.xml b/webapp/WEB-INF/spring.xml
index 6cab14f..56d9a04 100644
--- a/webapp/WEB-INF/spring.xml
+++ b/webapp/WEB-INF/spring.xml
@@ -6,4 +6,15 @@
 
     <context:annotation-config/>
     <context:component-scan base-package="ee.devclub"/>
+
+    <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+        <property name="jndiName" value="jdbc/ds"/>
+    </bean>
+
+    <bean id="liquibase" class="liquibase.integration.spring.SpringLiquibase">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="changeLog" value="WEB-INF/liquibase.xml"/>
+        <property name="contexts" value="test, production"/>
+    </bean>
+
 </beans>