diff --git a/P/Sda1/Jpa/rdbms2catalog/skeleton/src/main/java/de/hdm_stuttgart/mi/sda1/sql2catalog/RdbmsAccess.java b/P/Sda1/Jpa/rdbms2catalog/skeleton/src/main/java/de/hdm_stuttgart/mi/sda1/sql2catalog/RdbmsAccess.java
index 6e97a39e252fb18428dbc18a466c8fd418119881..b95fb999ce9943a6e69873b9ef527dfd30fa7051 100644
--- a/P/Sda1/Jpa/rdbms2catalog/skeleton/src/main/java/de/hdm_stuttgart/mi/sda1/sql2catalog/RdbmsAccess.java
+++ b/P/Sda1/Jpa/rdbms2catalog/skeleton/src/main/java/de/hdm_stuttgart/mi/sda1/sql2catalog/RdbmsAccess.java
@@ -16,7 +16,7 @@ public class RdbmsAccess {
 	static final EntityManager em;
 
 	static {
-		final EntityManagerFactory emFactory =  Persistence.createEntityManagerFactory("none");
+		final EntityManagerFactory emFactory =  Persistence.createEntityManagerFactory("update");
 		em = emFactory.createEntityManager();
 	}
 
@@ -27,6 +27,7 @@ public class RdbmsAccess {
 		// TODO: read RDBMS for products and related descriptions, then create DOM tree
         
 		transaction.commit();
+		em.getEntityManagerFactory().close();
 	}
 
 }
\ No newline at end of file
diff --git a/P/Sda1/Jpa/rdbms2catalog/skeleton/src/main/resources/META-INF/persistence.xml b/P/Sda1/Jpa/rdbms2catalog/skeleton/src/main/resources/META-INF/persistence.xml
index 6431ae651f354c8aa4a60111410b54cebf59992b..99110e6f430c683cb54e4d1174c5a7d2491cb863 100644
--- a/P/Sda1/Jpa/rdbms2catalog/skeleton/src/main/resources/META-INF/persistence.xml
+++ b/P/Sda1/Jpa/rdbms2catalog/skeleton/src/main/resources/META-INF/persistence.xml
@@ -3,53 +3,50 @@
 	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
 	http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
 	version="2.1">
-
-	<persistence-unit name="create-drop" transaction-type="RESOURCE_LOCAL">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+	
+	<persistence-unit name="drop-create" transaction-type="RESOURCE_LOCAL">
+		
+		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		
 		<properties>
-			<property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost/hdm" />
-			<property name="javax.persistence.jdbc.user" value="hdmuser" />
-			<property name="javax.persistence.jdbc.password" value="XYZ" />
-			<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />
+			<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+			<property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/hdm?useSSL=false"/>
+			<property name="javax.persistence.jdbc.user" value="hdmuser"/>
+			<property name="javax.persistence.jdbc.password" value="XYZ"/>
 			
-			<property name="hibernate.show_sql" value="true" />
-			<property name="hibernate.format_sql" value="true" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect" />
-			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			<property
+				name="javax.persistence.schema-generation.database.action"
+				value="drop-and-create"/>
+			
+			<property name="hibernate.format_sql" value="true"/>
+			<property name="hibernate.use_sql_comments" value="true"/>
 			
-			<!-- Configuring Connection Pool -->
+			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect" />
 			
-			<property name="hibernate.c3p0.min_size" value="5" />
-			<property name="hibernate.c3p0.max_size" value="20" />
-			<property name="hibernate.c3p0.timeout" value="500" />
-			<property name="hibernate.c3p0.max_statements" value="50" />
-			<property name="hibernate.c3p0.idle_test_period" value="2000" />
+			<property name="hibernate.archive.autodetection" value="class"/>
 			
 		</properties>
 	</persistence-unit>
 	
-	<persistence-unit name="none" transaction-type="RESOURCE_LOCAL">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+	<persistence-unit name="update" transaction-type="RESOURCE_LOCAL">
+		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		
 		<properties>
-			<property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost/hdm" />
-			<property name="javax.persistence.jdbc.user" value="hdmuser" />
-			<property name="javax.persistence.jdbc.password" value="XYZ" />
-			<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />
+			<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+			<property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/hdm?useSSL=false"/>
+			<property name="javax.persistence.jdbc.user" value="hdmuser"/>
+			<property name="javax.persistence.jdbc.password" value="XYZ"/>
 			
-			<property name="hibernate.show_sql" value="true" />
-			<property name="hibernate.format_sql" value="true" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect" />
-			<property name="hibernate.hbm2ddl.auto" value="none" />
+			<property
+				name="javax.persistence.schema-generation.database.action"
+				value="update"/>
 			
-			<!-- Configuring Connection Pool -->
+			<property name="hibernate.format_sql" value="true"/>
+			<property name="hibernate.use_sql_comments" value="true"/>
+			
+			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect" />
 			
-			<property name="hibernate.c3p0.min_size" value="5" />
-			<property name="hibernate.c3p0.max_size" value="20" />
-			<property name="hibernate.c3p0.timeout" value="500" />
-			<property name="hibernate.c3p0.max_statements" value="50" />
-			<property name="hibernate.c3p0.idle_test_period" value="2000" />
+			<property name="hibernate.archive.autodetection" value="class"/>
 			
 		</properties>
 	</persistence-unit>
diff --git a/P/Sda1/Jpa/rdbms2catalog/skeleton/src/test/java/rdbms2catalog/TestSchema.java b/P/Sda1/Jpa/rdbms2catalog/skeleton/src/test/java/rdbms2catalog/TestSchema.java
index 27ba0ee1b3be31e1fa49c40ce74ac1287e90d0ad..c1ee7553999ebe69e6950d542cf2586886159078 100644
--- a/P/Sda1/Jpa/rdbms2catalog/skeleton/src/test/java/rdbms2catalog/TestSchema.java
+++ b/P/Sda1/Jpa/rdbms2catalog/skeleton/src/test/java/rdbms2catalog/TestSchema.java
@@ -12,7 +12,7 @@ public class TestSchema {
     static final EntityManager em;
 
     static {
-	    final EntityManagerFactory emFactory =  Persistence.createEntityManagerFactory("create-drop");
+	    final EntityManagerFactory emFactory =  Persistence.createEntityManagerFactory("drop-create");
 	    em = emFactory.createEntityManager();
 	}
 
@@ -36,6 +36,7 @@ public class TestSchema {
 //	          instantTent.getDescriptions().add(new Description("Pre-attached tent poles"));
 	          
 	          transaction.commit();
+	          em.getEntityManagerFactory().close();
 	    }
 	}
 }
\ No newline at end of file
diff --git a/P/Sda1/Jpa/rdbms2catalog/solution/src/main/resources/META-INF/persistence.xml b/P/Sda1/Jpa/rdbms2catalog/solution/src/main/resources/META-INF/persistence.xml
index b932bc23d566195c67b0892b723dfc20dbd174de..7d12655f6f583b19c1c2fab8387e6d0cab1e65d5 100644
--- a/P/Sda1/Jpa/rdbms2catalog/solution/src/main/resources/META-INF/persistence.xml
+++ b/P/Sda1/Jpa/rdbms2catalog/solution/src/main/resources/META-INF/persistence.xml
@@ -5,7 +5,6 @@
 	version="2.1">
 	
 	<persistence-unit name="drop-create" transaction-type="RESOURCE_LOCAL">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
 		
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		
@@ -52,4 +51,4 @@
 		</properties>
 	</persistence-unit>
 	
-</persistence>
\ No newline at end of file
+</persistence>