diff --git a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Driver.java b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Driver.java
index 452b771..b91cf0f 100644
--- a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Driver.java
+++ b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Driver.java
@@ -44,41 +44,41 @@ public class Driver extends PlatformUser implements IDriver {
 
     @Override
     public Long getId() {
-        return id;
+        return super.getId();
     }
 
     @Override
     public void setId(Long id) {
-        this.id = id;
+        super.setId(id);
     }
 
     @Override
     public String getName() {
-        return name;
+        return super.getName();
     }
 
     @Override
     public void setName(String name) {
-        this.name = name;
+        super.setName(name);
     }
 
     @Override
     public String getTel() {
-        return tel;
+        return super.getTel();
     }
 
     @Override
     public void setTel(String tel) {
-        this.tel = tel;
+        super.setTel(tel);
     }
 
     @Override
     public Double getAvgRating() {
-        return avgRating;
+        return super.getAvgRating();
     }
 
     @Override
     public void setAvgRating(Double avgRating) {
-        this.avgRating = avgRating;
+        super.setAvgRating(avgRating);
     }
 }
diff --git a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Rider.java b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Rider.java
index ac7b948..2e87ab6 100644
--- a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Rider.java
+++ b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Rider.java
@@ -3,20 +3,19 @@ package dst.ass1.jpa.model.impl;
 import dst.ass1.jpa.model.IPreferences;
 import dst.ass1.jpa.model.IRider;
 import dst.ass1.jpa.model.ITrip;
+import org.hibernate.annotations.Cascade;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import static dst.ass1.jpa.util.Constants.M_RIDER_ACCOUNT;
-import static dst.ass1.jpa.util.Constants.M_RIDER_BANK_CODE;
+import static dst.ass1.jpa.util.Constants.*;
 
+@Entity
 @Table(
         uniqueConstraints = @UniqueConstraint(columnNames = {M_RIDER_ACCOUNT, M_RIDER_BANK_CODE})
 )
-
-@Entity
 public class Rider extends PlatformUser implements IRider {
     @Column(unique = true) @NotNull
     private String email;
@@ -31,6 +30,8 @@ public class Rider extends PlatformUser implements IRider {
     private String bankCode;
 
     @OneToOne(targetEntity = Preferences.class, optional = false)
+    @Cascade(org.hibernate.annotations.CascadeType.ALL)
+    @JoinColumn(name = I_PREFERENCES, unique = true)
     private IPreferences preferences;
 
     @ManyToOne(targetEntity = Trip.class)
@@ -38,42 +39,42 @@ public class Rider extends PlatformUser implements IRider {
 
     @Override
     public Long getId() {
-        return id;
+        return super.getId();
     }
 
     @Override
     public void setId(Long id) {
-        this.id = id;
+        super.setId(id);
     }
 
     @Override
     public String getName() {
-        return name;
+        return super.getName();
     }
 
     @Override
     public void setName(String name) {
-        this.name = name;
+        super.setName(name);
     }
 
     @Override
     public String getTel() {
-        return tel;
+        return super.getTel();
     }
 
     @Override
     public void setTel(String tel) {
-        this.tel = tel;
+        super.setTel(tel);
     }
 
     @Override
     public Double getAvgRating() {
-        return avgRating;
+        return super.getAvgRating();
     }
 
     @Override
     public void setAvgRating(Double avgRating) {
-        this.avgRating = avgRating;
+        super.setAvgRating(avgRating);
     }
 
     @Override
diff --git a/ass1-jpa/src/main/resources/META-INF/Trip.xml b/ass1-jpa/src/main/resources/META-INF/Trip.xml
index 1291bec..e4dcf50 100644
--- a/ass1-jpa/src/main/resources/META-INF/Trip.xml
+++ b/ass1-jpa/src/main/resources/META-INF/Trip.xml
@@ -4,6 +4,19 @@
                  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
                  version="2.0">
 
-  <!-- TODO -->
+  <entity class="dst.ass1.jpa.model.impl.Trip" name="Trip">
+    <entity-listeners>
+      <entity-listener class="dst.ass1.jpa.listener.TripListener" />
+    </entity-listeners>
+    <attributes>
+      <id name="id"><generated-value /></id>
+      <many-to-one name="pickup" target-entity="dst.ass1.jpa.model.impl.Location" optional="false" />
+      <many-to-one name="destination" target-entity="dst.ass1.jpa.model.impl.Location" optional="false" />
+      <many-to-many name="stops" target-entity="dst.ass1.jpa.model.impl.Location" />
+      <one-to-one name="tripInfo" target-entity="dst.ass1.jpa.model.impl.TripInfo" />
+      <one-to-one name="match" target-entity="dst.ass1.jpa.model.impl.Match" mapped-by="trip" />
+      <one-to-one name="rider" target-entity="dst.ass1.jpa.model.impl.Rider" />
+    </attributes>
+  </entity>
 
 </entity-mappings>