diff --git a/03/src/de/dis2013/Main.java b/03/src/de/dis2013/Main.java
index 0768d1e..c25a436 100644
--- a/03/src/de/dis2013/Main.java
+++ b/03/src/de/dis2013/Main.java
@@ -46,7 +46,7 @@ public class Main {
 		MaklerAuthenticator ma = new MaklerAuthenticator(service);
 		
 		//Testdaten
-		service.addTestData();
+		//service.addTestData();
 		
 		//Verarbeite Eingabe
 		while(true) {
diff --git a/03/src/de/dis2013/data/mapping/Immobilie.hbm.xml b/03/src/de/dis2013/data/mapping/Immobilie.hbm.xml
index 11369b0..101d8b1 100644
--- a/03/src/de/dis2013/data/mapping/Immobilie.hbm.xml
+++ b/03/src/de/dis2013/data/mapping/Immobilie.hbm.xml
@@ -14,10 +14,17 @@
 		<property name="flaeche" type="integer" column="flaeche" />
 		<many-to-one name="verwalter" class="de.dis2013.data.Makler" column="verwalter" not-null="true" />
 		
-		<union-subclass name="de.dis2013.data.Haus" table="haeuser">
-			<property name="stockwerke" type="integer" column="stockwerke" />
-			<property name="kaufpreis" type="integer" column="kaufpreis" />
-			<property name="garten" type="boolean" column="garten" />
+		<union-subclass name="de.dis2013.data.Haus" table="house">
+			<property name="stockwerke" type="integer" column="floors" />
+			<property name="kaufpreis" type="integer" column="price" />
+			<property name="garten" type="boolean" column="garden" />
+		</union-subclass>
+		<union-subclass name="de.dis2013.data.Wohnung" table="apartment">
+			<property name="stockwerk" type="integer" column="floor" />
+			<property name="mietpreis" type="integer" column="rent" />
+			<property name="zimmer" type="integer" column="rooms" />
+			<property name="balkon" type="boolean" column="balcony" />
+			<property name="ebk" type="boolean" column="builtinkitchen" />
 		</union-subclass>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/03/src/hibernate.cfg.xml b/03/src/hibernate.cfg.xml
index 4a21b18..150b701 100644
--- a/03/src/hibernate.cfg.xml
+++ b/03/src/hibernate.cfg.xml
@@ -7,8 +7,8 @@
 	<session-factory>
 		<property name="connection.driver_class">com.ibm.db2.jcc.DB2Driver</property>
 		<property name="connection.url">jdbc:db2://vsisls4.informatik.uni-hamburg.de:50001/VSISP</property>
-		<property name="connection.username">vsisp**</property>
-		<property name="connection.password">********</property>
+		<property name="connection.username">vsisp12</property>
+		<property name="connection.password">h9QE2Vxc</property>
 
 		<property name="dialect">org.hibernate.dialect.DB2Dialect</property>
 		<property name="current_session_context_class">thread</property>