diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index c6e152d8..1cd8862a 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0"
-	xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<persistence version="2.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_2_0.xsd">
@@ -9,6 +8,7 @@
 		<jta-data-source>${jpa.datasource.name}</jta-data-source>
 		<shared-cache-mode>ENABLE_SELECTIVE</shared-cache-mode>
 		<properties>
+			<property name="openejb.jpa.auto-scan" value="true" />
 
 			<property name="format_sql" value="true" />
 			<property name="use_sql_comments" value="true" />
@@ -22,26 +22,17 @@
 
 			<property name="hibernate.generate_statistics" value="true" />
 
-			<property name="hibernate.cache.use_second_level_cache"
-				value="${jpa.cache}" />
+			<property name="hibernate.cache.use_second_level_cache" value="${jpa.cache}" />
 			<property name="hibernate.cache.use_query_cache" value="${jpa.cache}" />
 
-			<property name="hibernate.cache.region.factory_class"
-				value="org.hibernate.cache.infinispan.InfinispanRegionFactory" />
-			<property name="hibernate.cache.infinispan.statistics"
-				value="true" />
+			<property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.infinispan.InfinispanRegionFactory" />
+			<property name="hibernate.cache.infinispan.statistics" value="true" />
 
-			<property name="hibernate.cache.infinispan.entity.eviction.strategy"
-				value="LRU" />
-			<property
-				name="hibernate.cache.infinispan.entity.eviction.wake_up_interval"
-				value="2000" />
-			<property name="hibernate.cache.infinispan.entity.eviction.max_entries"
-				value="10000" />
-			<property name="hibernate.cache.infinispan.entity.expiration.lifespan"
-				value="60000" />
-			<property name="hibernate.cache.infinispan.entity.expiration.max_idle"
-				value="30000" />
+			<property name="hibernate.cache.infinispan.entity.eviction.strategy" value="LRU" />
+			<property name="hibernate.cache.infinispan.entity.eviction.wake_up_interval" value="2000" />
+			<property name="hibernate.cache.infinispan.entity.eviction.max_entries" value="10000" />
+			<property name="hibernate.cache.infinispan.entity.expiration.lifespan" value="60000" />
+			<property name="hibernate.cache.infinispan.entity.expiration.max_idle" value="30000" />
 
 		</properties>
 	</persistence-unit>