pom.xml                                            |   23 ++++++++++++++---
 poulpe-model/pom.xml                               |    5 +++-
 .../model/dao/hibernate/UserHibernateDao.java      |   10 ++++----
 poulpe-model/src/main/resources/log4j.xml          |    4 +++
 .../jtalks/poulpe/migrations/V1__Base_version.sql  |    2 +-
 .../org/jtalks/poulpe/model/datasource.properties  |    2 +-
 .../org/jtalks/poulpe/model/entity/Branch.hbm.xml  |   17 ++++++++++---
 .../org/jtalks/poulpe/model/entity/Section.hbm.xml |   14 +++++++++-
 .../org/jtalks/poulpe/model/entity/User.hbm.xml    |   26 ++++++++++++-------
 .../org/jtalks/poulpe/model/entity/ehcache.xml     |   24 ++++++++++++++++++
 .../org/jtalks/poulpe/model/entity/jgroups_tcp.xml |   26 --------------------
 11 files changed, 99 insertions(+), 54 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d5357c..694da30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,10 @@
       <id>ZK CE</id>
       <url>http://mavensync.zkoss.org/maven2</url>
     </repository>
+    <repository>
+        <id>terracotta-releases</id>
+        <url>http://www.terracotta.org/download/reflector/releases</url>
+    </repository>
   </repositories>
 
   <dependencyManagement>
@@ -73,13 +77,24 @@
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache-core</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.3</version>
       </dependency>
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache-jgroupsreplication</artifactId>
         <version>1.5</version>
       </dependency>
+      <dependency>
+        <groupId>org.terracotta</groupId>
+        <artifactId>ehcache-probe</artifactId>
+        <version>1.0.2</version>
+        <exclusions>
+            <exclusion>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-jdk14</artifactId>
+            </exclusion>
+        </exclusions>
+      </dependency>
 
       <!-- JDBC -->
       <dependency>
@@ -102,12 +117,12 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.6.1</version>
+        <version>1.5.8</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.6.1</version>
+        <version>1.5.8</version>
       </dependency>
 
       <!-- Spring -->
@@ -457,7 +472,7 @@
     <springVersion>3.0.5.RELEASE</springVersion>
     <zkVersion>6.0.1.FL.20120413</zkVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <common.version>0.14</common.version>
+    <common.version>0.14-SNAPSHOT</common.version>
   </properties>
 
   <distributionManagement>
diff --git a/poulpe-model/pom.xml b/poulpe-model/pom.xml
index a054302..de87b91 100644
--- a/poulpe-model/pom.xml
+++ b/poulpe-model/pom.xml
@@ -126,7 +126,10 @@
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache-jgroupsreplication</artifactId>
     </dependency>
-    
+    <dependency>
+        <groupId>org.terracotta</groupId>
+        <artifactId>ehcache-probe</artifactId>
+    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/poulpe-model/src/main/java/org/jtalks/poulpe/model/dao/hibernate/UserHibernateDao.java b/poulpe-model/src/main/java/org/jtalks/poulpe/model/dao/hibernate/UserHibernateDao.java
index 29131a9..800995f 100644
--- a/poulpe-model/src/main/java/org/jtalks/poulpe/model/dao/hibernate/UserHibernateDao.java
+++ b/poulpe-model/src/main/java/org/jtalks/poulpe/model/dao/hibernate/UserHibernateDao.java
@@ -39,7 +39,7 @@ public class UserHibernateDao extends AbstractHibernateParentRepository<User> im
      */
     @Override
     public User getPoulpeUserByUsername(String username) {
-        return (User) getSession().createQuery("from " + type.getSimpleName() + " u where u.username = ?")
+        return (User) getSession().createQuery("from " + type.getCanonicalName() + " u where u.username = ?")
                 .setString(0, username).uniqueResult();
     }
 
@@ -48,7 +48,7 @@ public class UserHibernateDao extends AbstractHibernateParentRepository<User> im
      */
     @Override
     public User getPoulpeUserByEncodedUsername(String encodedUsername) {
-        return (User) getSession().createQuery("from " + type.getSimpleName() + " u where u.encodedUsername = ?")
+        return (User) getSession().createQuery("from " + type.getCanonicalName() + " u where u.encodedUsername = ?")
                 .setCacheable(true).setString(0, encodedUsername).uniqueResult();
     }
 
@@ -58,7 +58,7 @@ public class UserHibernateDao extends AbstractHibernateParentRepository<User> im
     @SuppressWarnings("unchecked")
     @Override
     public List<User> getAllPoulpeUsers() {
-        return (List<User>) getSession().createQuery("from " + type.getSimpleName()).list();
+        return (List<User>) getSession().createQuery("from " + type.getCanonicalName()).list();
     }
 
     /**
@@ -68,7 +68,7 @@ public class UserHibernateDao extends AbstractHibernateParentRepository<User> im
     @Override
     public List<User> getPoulpeUserByUsernamePart(String substring) {
         String param = MessageFormat.format("%{0}%", substring);
-        return (List<User>) getSession().createQuery("from " + type.getSimpleName() + " u where u.username like ?")
+        return (List<User>) getSession().createQuery("from " + type.getCanonicalName() + " u where u.username like ?")
                 .setString(0, param).list();
     }
 
@@ -93,7 +93,7 @@ public class UserHibernateDao extends AbstractHibernateParentRepository<User> im
     @Override
     public List<User> getNonBannedByUsername(String word, int maxResults) {
         return (List<User>) getSession()
-                .createQuery("from " + type.getSimpleName() + " u where u.banReason is null and u.username like ?")
+                .createQuery("from " + type.getCanonicalName() + " u where u.banReason is null and u.username like ?")
                 .setString(0, MessageFormat.format("%{0}%", word)).setMaxResults(maxResults).list();
     }
 
diff --git a/poulpe-model/src/main/resources/log4j.xml b/poulpe-model/src/main/resources/log4j.xml
index 94f4786..4d42b54 100644
--- a/poulpe-model/src/main/resources/log4j.xml
+++ b/poulpe-model/src/main/resources/log4j.xml
@@ -40,6 +40,10 @@
     <appender-ref ref="CONSOLE"/>
     <appender-ref ref="FILE"/>
   </logger>
+  <logger name="net.sf.ehcache.distribution">
+    <level value="DEBUG"/>
+  </logger>
+
   <root>
     <priority value="INFO"/>
     <appender-ref ref="CONSOLE"/>
diff --git a/poulpe-model/src/main/resources/org/jtalks/poulpe/migrations/V1__Base_version.sql b/poulpe-model/src/main/resources/org/jtalks/poulpe/migrations/V1__Base_version.sql
index e50f5ce..d964b50 100644
--- a/poulpe-model/src/main/resources/org/jtalks/poulpe/migrations/V1__Base_version.sql
+++ b/poulpe-model/src/main/resources/org/jtalks/poulpe/migrations/V1__Base_version.sql
@@ -24,7 +24,7 @@ CREATE  TABLE `BRANCH_USER_REF` (
   CONSTRAINT `FK_BRANCH_USER_REF_USERS_USER_ID`
     FOREIGN KEY (`USER_ID`)
     REFERENCES `USERS` (`ID`),
-  CONSTRAINT `FK_BRANCH`
+  CONSTRAINT `FK_BRANCH_USER_REF_BRACHES_BRANCH_ID`
     FOREIGN KEY (`BRANCH_ID`)
     REFERENCES `BRANCHES` (`BRANCH_ID`));
 
diff --git a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/datasource.properties b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/datasource.properties
index 74d74a6..c2fa8c8 100644
--- a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/datasource.properties
+++ b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/datasource.properties
@@ -14,7 +14,7 @@
 #
 
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost/p_poulpe?characterEncoding=UTF-8
+jdbc.url=jdbc:mysql://localhost/jtalks?characterEncoding=UTF-8
 jdbc.username=${jdbc.user}
 jdbc.password=${jdbc.pass}
 hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
diff --git a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/Branch.hbm.xml b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/Branch.hbm.xml
index 5b7ee2b..d35e0a9 100644
--- a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/Branch.hbm.xml
+++ b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/Branch.hbm.xml
@@ -18,11 +18,16 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
-  <class name="org.jtalks.poulpe.model.entity.PoulpeBranch" table="BRANCHES">
-    <cache usage="nonstrict-read-write"/>
+  <class name="org.jtalks.common.model.entity.Branch" table="BRANCHES">
+    <cache usage="nonstrict-read-write" region="org.jtalks.EHCOMMON"/>
     <id column="BRANCH_ID" name="id" unsaved-value="0">
       <generator class="native"/>
     </id>
+    
+    <discriminator>
+        <formula>'BRANCH'</formula>
+    </discriminator>
+
     <property column="UUID" name="uuid" not-null="true" unique="true"/>
     <property column="NAME" name="name" not-null="true"/>
     <property column="DESCRIPTION" name="description"/>
@@ -30,7 +35,11 @@
     <many-to-one column="SECTION_ID" name="section" class="org.jtalks.poulpe.model.entity.PoulpeSection" lazy="false"
                  update="false" insert="false"/>
 
-    <many-to-one name="moderatorsGroup" cascade="save-update" foreign-key="FK_MODERATORS_GROUP_ID"
-                 column="MODERATORS_GROUP_ID" class="org.jtalks.common.model.entity.Group"/>
+    <subclass name="org.jtalks.poulpe.model.entity.PoulpeBranch"
+            extends="org.jtalks.common.model.entity.Branch"  
+            discriminator-value="BRANCH">
+        <many-to-one name="moderatorsGroup" cascade="save-update" foreign-key="FK_MODERATORS_GROUP_ID"
+                      column="MODERATORS_GROUP_ID" class="org.jtalks.common.model.entity.Group"/>
+    </subclass>
   </class>
 </hibernate-mapping>
diff --git a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/Section.hbm.xml b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/Section.hbm.xml
index c3a489f..8493699 100644
--- a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/Section.hbm.xml
+++ b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/Section.hbm.xml
@@ -18,11 +18,16 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
         "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
-  <class name="org.jtalks.poulpe.model.entity.PoulpeSection" table="SECTIONS">
-    <cache usage="nonstrict-read-write"/>
+  <class name="org.jtalks.common.model.entity.Section" table="SECTIONS" abstract="true">
+    <cache usage="nonstrict-read-write" region="org.jtalks.EHCOMMON"/>
     <id column="SECTION_ID" name="id" unsaved-value="0">
       <generator class="native"/>
     </id>
+    
+    <discriminator>
+        <formula>'SECTION'</formula>
+    </discriminator>
+    
     <property column="UUID" name="uuid" not-null="true"/>
     <property column="NAME" name="name" not-null="true"/>
     <property column="DESCRIPTION" name="description"/>
@@ -33,6 +38,11 @@
       <list-index column="POSITION"/>
       <one-to-many class="org.jtalks.poulpe.model.entity.PoulpeBranch"/>
     </list>
+    
+    <subclass name="org.jtalks.poulpe.model.entity.PoulpeSection"
+        extends="org.jtalks.common.model.entity.Section" 
+        discriminator-value="SECTION">
+    </subclass>
 
   </class>
 
diff --git a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/User.hbm.xml b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/User.hbm.xml
index 8b3c8a2..c0c151d 100644
--- a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/User.hbm.xml
+++ b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/User.hbm.xml
@@ -17,14 +17,18 @@
 -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-  <class name="org.jtalks.poulpe.model.entity.User" table="USERS">
-    <cache usage="nonstrict-read-write"/>
+<hibernate-mapping package="org.jtalks.poulpe.model.entity.User" auto-import="false">
+  <class name="org.jtalks.common.model.entity.User" table="USERS">
+    <cache usage="nonstrict-read-write" region="org.jtalks.EHCOMMON"/>
     
     <id column="ID" name="id" unsaved-value="0">
       <generator class="native"/>
     </id>
     
+    <discriminator>
+        <formula>'USER'</formula>
+    </discriminator>
+    
     <property column="UUID" name="uuid" unique="true" not-null="true"/>
     
     <property column="FIRST_NAME" name="firstName"/>
@@ -48,13 +52,15 @@
     
     <property column="SALT" name="salt" not-null="true"/>
     
-    <bag name="groups" table="GROUP_USER_REF" inverse="true" lazy="true" fetch="select">
-      <cache usage="nonstrict-read-write" />
-      <key column="USER_ID" not-null="true" />
-      <many-to-many class="org.jtalks.common.model.entity.Group">
-        <column name="GROUP_ID" not-null="true" />
-      </many-to-many>
-    </bag>
+    <subclass name="org.jtalks.poulpe.model.entity.User" discriminator-value="USER">
+	    <bag name="groups" table="GROUP_USER_REF" inverse="true" lazy="true" fetch="select">
+	      <cache usage="nonstrict-read-write" />
+	      <key column="USER_ID" not-null="true" />
+	      <many-to-many class="org.jtalks.common.model.entity.Group">
+	        <column name="GROUP_ID" not-null="true" />
+	      </many-to-many>
+	    </bag>
+    </subclass>
     
   </class>
 </hibernate-mapping>
diff --git a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/ehcache.xml b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/ehcache.xml
index 5cea532..7fb045c 100644
--- a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/ehcache.xml
+++ b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/ehcache.xml
@@ -16,6 +16,21 @@
 -->
 <ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://ehcache.sf.net/ehcache.xsd">
+  
+  <diskStore path="java.io.tmpdir"/>    
+  
+  <cacheManagerPeerProviderFactory class="net.sf.ehcache.distribution.jgroups.JGroupsCacheManagerPeerProviderFactory"
+        properties="connect=UDP(mcast_addr=235.0.0.1;mcast_port=45567;):PING:
+                    MERGE2:FD_SOCK:VERIFY_SUSPECT:pbcast.NAKACK:UNICAST:pbcast.STABLE:
+                    FRAG:pbcast.GMS"
+        propertySeparator="::"
+/>  
+        
+  <!-- enable ehcache monitoring -->
+    <cacheManagerPeerListenerFactory
+        class="org.terracotta.ehcachedx.monitor.probe.ProbePeerListenerFactory"
+        properties="monitorAddress=localhost, monitorPort=9889, memoryMeasurement=false" /> 
+  
   <defaultCache maxElementsInMemory="1000"
                 eternal="false" timeToIdleSeconds="120" timeToLiveSeconds="300" overflowToDisk="false"
                 diskPersistent="false" memoryStoreEvictionPolicy="LRU"/>
@@ -25,4 +40,13 @@
 
   <cache name="org.hibernate.cache.UpdateTimestampsCache"
          maxElementsInMemory="5000" eternal="true" overflowToDisk="false"/>
+  
+  <cache name="org.jtalks.EHCOMMON"
+         maxElementsInMemory="5000" eternal="true" overflowToDisk="false">
+         <cacheEventListenerFactory class="net.sf.ehcache.distribution.jgroups.JGroupsCacheReplicatorFactory"
+            properties="replicateAsynchronously=true, replicatePuts=false,
+                        replicateUpdates=true, replicateUpdatesViaCopy=false,
+                        replicateRemovals=true"/>
+  </cache>
+  
 </ehcache>
\ No newline at end of file
diff --git a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/jgroups_tcp.xml b/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/jgroups_tcp.xml
deleted file mode 100644
index 2c6d14e..0000000
--- a/poulpe-model/src/main/resources/org/jtalks/poulpe/model/entity/jgroups_tcp.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0'?>
-<!--
-
-    Copyright (C) 2011  JTalks.org Team
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
--->
-<config>
-    <TCP bind_addr="192.168.8.61" bind_port="7800" />
-    <TCPPING timeout="3000" initial_hosts="192.168.8.61[7800]" port_range="10" num_initial_members="3"/>
-    <VERIFY_SUSPECT timeout="1500"/>
-    <pbcast.NAKACK use_mcast_xmit="false" gc_lag="100" retransmit_timeout="300,600,1200,2400,4800"
-                   discard_delivered_msgs="true"/>
-    <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true"/>
-</config>
\ No newline at end of file