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 aea4e98..b9c8b0f 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
@@ -16,13 +16,13 @@ public class Match implements IMatch {
     @Embedded @Target(Money.class)
     private IMoney fare;
 
-    @OneToOne(targetEntity = Trip.class)
+    @OneToOne(targetEntity = Trip.class, fetch = FetchType.EAGER)
     private ITrip trip;
 
-    @ManyToOne(targetEntity = Vehicle.class)
+    @ManyToOne(targetEntity = Vehicle.class, fetch = FetchType.EAGER)
     private IVehicle vehicle;
 
-    @ManyToOne(targetEntity = Driver.class)
+    @ManyToOne(targetEntity = Driver.class, fetch = FetchType.EAGER)
     private IDriver driver;
 
     @Override
@@ -57,31 +57,31 @@ public class Match implements IMatch {
 
     @Override
     public ITrip getTrip() {
-        return null;
+        return trip;
     }
 
     @Override
     public void setTrip(ITrip trip) {
-
+        this.trip = trip;
     }
 
     @Override
     public IVehicle getVehicle() {
-        return null;
+        return vehicle;
     }
 
     @Override
     public void setVehicle(IVehicle vehicle) {
-
+        this.vehicle = vehicle;
     }
 
     @Override
     public IDriver getDriver() {
-        return null;
+        return driver;
     }
 
     @Override
     public void setDriver(IDriver driver) {
-
+        this.driver = driver;
     }
 }