diff --git a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
index 2dee5cf..4a80c62 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
@@ -142,12 +142,20 @@ public class DBHandler {
         if (rs.getDate("geburtsdatum") != null) {
             patient.setGeburtsdatum(rs.getDate("geburtsdatum").toLocalDate());
         }
+
+        patient.setCave(rs.getString("cave"));
+
         patient.setStrasse(rs.getString("strasse"));
         patient.setHausnummer(rs.getString("hausnummer"));
         patient.setPlz(rs.getString("plz"));
+        patient.setOrt(rs.getString("ort"));
         patient.setTelefon(rs.getString("telefon"));
-        // patient.setFamilienstand(rs.getString("familienstand")); TODO
-        // patient.setGeschlecht(Patient.Geschlecht.valueOf(rs.getString("geschlecht"))); TODO
+        if (rs.getString("familienstand") != null) {
+            patient.setFamilienstand(Patient.Familienstand.parseChar(rs.getString("familienstand").charAt(0)));
+        }
+        if (rs.getString("geschlecht") != null) {
+            patient.setGeschlecht(Patient.Geschlecht.parseChar(rs.getString("geschlecht").charAt(0)));
+        }
         patient.setVersichertennummer(rs.getString("versichertennummer"));
         patient.setKassenID(rs.getInt("kassenid"));
         setVersionInformation(patient, rs);