diff --git a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Location.java b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Location.java
index f8495c2..4b9a5aa 100644
--- a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Location.java
+++ b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Location.java
@@ -6,6 +6,7 @@ import dst.ass1.jpa.model.ITrip;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import java.util.Collection;
 
 @Entity
 public class Location implements ILocation {
@@ -15,7 +16,7 @@ public class Location implements ILocation {
     private Long locationId;
 
     @ManyToMany
-    private ITrip trip;
+    private Collection<ITrip> trips;
 
     @Override
     public Long getId() {
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 3bf68f2..cb3ca5c 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
@@ -13,9 +13,11 @@ public class Match implements IMatch {
     @Embedded
     private IMoney fare;
 
-    // TODO add annotations
+    @OneToOne
     private ITrip trip;
+    @ManyToOne
     private IVehicle vehicle;
+    @ManyToOne
     private IDriver driver;
 
     @Override
diff --git a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Organization.java b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Organization.java
index ed28961..bfce4f3 100644
--- a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Organization.java
+++ b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Organization.java
@@ -15,6 +15,8 @@ public class Organization implements IOrganization {
     private String name;
     @ManyToMany
     private Collection<IOrganization> parts;
+    @ManyToMany(mappedBy = "parts")
+    private Collection<IOrganization> partOf;
 
     public Organization() {
     }
diff --git a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Trip.java b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Trip.java
index ebfcedb..9d10bc7 100644
--- a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Trip.java
+++ b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Trip.java
@@ -4,6 +4,7 @@ import dst.ass1.jpa.model.*;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.ManyToMany;
 import java.util.Collection;
 import java.util.Date;
 
@@ -17,6 +18,7 @@ public class Trip implements ITrip {
     private ILocation pickup;
     private ILocation destination;
 
+    @ManyToMany(mappedBy = "trip")
     private Collection<ILocation> stops;
     private ITripInfo tripInfo;
     private IMatch match;
diff --git a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Vehicle.java b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Vehicle.java
index 0a870d4..5b26d40 100644
--- a/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Vehicle.java
+++ b/ass1-jpa/src/main/java/dst/ass1/jpa/model/impl/Vehicle.java
@@ -6,6 +6,7 @@ import dst.ass1.jpa.model.IOrganization;
 import dst.ass1.jpa.model.IVehicle;
 
 import javax.persistence.*;
+import java.util.Collection;
 
 @Entity
 public class Vehicle implements IVehicle {
@@ -17,11 +18,11 @@ public class Vehicle implements IVehicle {
     private String type;
 
     @OneToMany
-    private IDriver driver;
+    private Collection<IDriver> driver;
     @OneToMany
-    private IMatch match;
+    private Collection<IMatch> match;
     @ManyToMany
-    private IOrganization organization;
+    private Collection<IOrganization> organization;
 
     @Override
     public Long getId() {