diff --git a/core/src/main/java/cz/muni/fi/pa165/core/company/Company.java b/core/src/main/java/cz/muni/fi/pa165/core/company/Company.java
index f495e09259d16f61daff8e236ded802707963018..202eab6b38919b10ad27dd7da233a9b9c3052762 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/company/Company.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/company/Company.java
@@ -22,6 +22,6 @@ import java.util.List;
 @Table(name = "domain_company")
 public class Company extends DomainObject {
     private String name;
-    @OneToMany
+    @OneToMany(mappedBy = "company")
     private List<CompanyRole> employeeList;
 }
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/device/Device.java b/core/src/main/java/cz/muni/fi/pa165/core/device/Device.java
index b2b8a4370783f496e8d15de886c021e173856f3b..f10e88d2c36700870dafde60616587c77bb34b5f 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/device/Device.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/device/Device.java
@@ -26,12 +26,9 @@ public class Device extends DomainObject {
 
   private String name;
 
-  @OneToMany
+  @OneToMany(mappedBy = "device")
   private List<SmartMeter> smartMeterList;
 
   @ManyToOne
   private Manufacturer manufacturer;
-
-  // Company ??
-  // private Company company;
 }
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/house/House.java b/core/src/main/java/cz/muni/fi/pa165/core/house/House.java
index 32da728fd1907ac94997a7ce0023056c6df8f0f0..2eb2e622c26a295d89bf435183d1ea61a898eb73 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/house/House.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/house/House.java
@@ -26,9 +26,9 @@ public class House extends DomainObject {
   private String state;
   private String zipcode;
 
-  @OneToMany
+  @OneToMany(mappedBy = "house")
   private List<SmartMeter> smartMeterList;
 
-  @OneToMany
+  @OneToMany(mappedBy = "house")
   private List<HouseRole> ownerList;
 }
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/manufacturer/Manufacturer.java b/core/src/main/java/cz/muni/fi/pa165/core/manufacturer/Manufacturer.java
index b7c40b0ef92120ff97125c96edd9ae8d2020ada0..767dd0470305837000e0e8875386efc9015eb63a 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/manufacturer/Manufacturer.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/manufacturer/Manufacturer.java
@@ -24,5 +24,6 @@ public class Manufacturer extends DomainObject {
 
   private String name;
 
-  @OneToMany private List<Device> deviceList;
+  @OneToMany(mappedBy = "manufacturer")
+  private List<Device> deviceList;
 }
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeter.java b/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeter.java
index d8e8517b7e797e3ba65c270e93d208a8d8d6b1a4..f99ffbc7e7acab094f2472a39957f63953107de9 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeter.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeter.java
@@ -33,6 +33,6 @@ public class SmartMeter extends DomainObject {
     @ManyToOne
     private House house;
 
-    @OneToMany
+    @OneToMany(mappedBy = "smartMeter")
     private List<Metrics> metricsList;
 }
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/user/User.java b/core/src/main/java/cz/muni/fi/pa165/core/user/User.java
index fddbffe18e20539c0d145e6da7040f85021de1c6..fd12eee3a8e6b55028763cac921df4b60801b07d 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/user/User.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/user/User.java
@@ -38,6 +38,6 @@ public class User extends DomainObject {
 
   private String lastName;
 
-  @OneToMany
+  @OneToMany(mappedBy = "user")
   private List<Role> rolesList;
 }
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/user/roles/RoleController.java b/core/src/main/java/cz/muni/fi/pa165/core/user/roles/RoleController.java
index 1c57f304bfa1595f5268694089f0b162f4f524c4..3abef5e887ffa31a77718d16d2976a239cb0180e 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/user/roles/RoleController.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/user/roles/RoleController.java
@@ -11,11 +11,13 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+@Tag(name = "role", description = "Role API")
 @RestController
 @RequestMapping("/api/role")
 public class RoleController {