diff --git a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Match.java b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Match.java
index f65e1dd..3bf68f2 100644
--- a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Match.java
+++ b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Match.java
@@ -2,8 +2,7 @@ package dst.ass1.jpa.model.impl;
 
 import dst.ass1.jpa.model.*;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import javax.persistence.*;
 import java.util.Date;
 
 @Entity
@@ -11,6 +10,7 @@ public class Match implements IMatch {
     @Id
     private Long id;
     private Date date;
+    @Embedded
     private IMoney fare;
 
     // TODO add annotations
diff --git a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Money.java b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Money.java
index 38fcf5b..2c853ca 100644
--- a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Money.java
+++ b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Money.java
@@ -2,8 +2,10 @@ package dst.ass1.jpa.model.impl;
 
 import dst.ass1.jpa.model.IMoney;
 
+import javax.persistence.Embeddable;
 import java.math.BigDecimal;
 
+@Embeddable
 public class Money implements IMoney {
     private String currency;
     private BigDecimal value;
diff --git a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/TripInfo.java b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/TripInfo.java
index 9abd603..582be5d 100644
--- a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/TripInfo.java
+++ b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/TripInfo.java
@@ -4,6 +4,7 @@ import dst.ass1.jpa.model.IMoney;
 import dst.ass1.jpa.model.ITrip;
 import dst.ass1.jpa.model.ITripInfo;
 
+import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
@@ -15,6 +16,7 @@ public class TripInfo implements ITripInfo {
    private Long id;
    private Date completed;
    private Double distance;
+   @Embedded
    private IMoney total;
    private Integer driverRating;
    private Integer riderRating;