diff --git a/src/main/java/bg/softuni/invoice/model/base/UserBaseModel.java b/src/main/java/bg/softuni/invoice/model/base/UserBaseModel.java
deleted file mode 100644
index 2e932d8..0000000
--- a/src/main/java/bg/softuni/invoice/model/base/UserBaseModel.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package bg.softuni.invoice.model.base;
-
-public abstract class UserBaseModel {
-
-    private String id;
-    private String username;
-    private String firstName;
-    private String lastName;
-    private boolean enabled;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-}
diff --git a/src/main/java/bg/softuni/invoice/model/service/UserServiceModel.java b/src/main/java/bg/softuni/invoice/model/service/UserServiceModel.java
index ef05794..e3cfe7d 100644
--- a/src/main/java/bg/softuni/invoice/model/service/UserServiceModel.java
+++ b/src/main/java/bg/softuni/invoice/model/service/UserServiceModel.java
@@ -1,14 +1,53 @@
 package bg.softuni.invoice.model.service;
 
-import bg.softuni.invoice.model.base.UserBaseModel;
-
 import java.util.HashSet;
 import java.util.Set;
 
-public class UserServiceModel extends UserBaseModel {
+public class UserServiceModel {
 
+    private String id;
+    private String username;
+    private String firstName;
+    private String lastName;
     private String password;
-    private Set<RoleServiceModel> authorities = new HashSet<>();
+    private Set<RoleServiceModel> authorities;
+    private boolean enabled;
+
+    public UserServiceModel() {
+        setAuthorities(new HashSet<>());
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
 
     public String getPassword() {
         return password;
@@ -25,4 +64,12 @@ public Set<RoleServiceModel> getAuthorities() {
     public void setAuthorities(Set<RoleServiceModel> authorities) {
         this.authorities = authorities;
     }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
 }
diff --git a/src/main/java/bg/softuni/invoice/model/view/UserViewModel.java b/src/main/java/bg/softuni/invoice/model/view/UserViewModel.java
index e330762..c648568 100644
--- a/src/main/java/bg/softuni/invoice/model/view/UserViewModel.java
+++ b/src/main/java/bg/softuni/invoice/model/view/UserViewModel.java
@@ -1,13 +1,47 @@
 package bg.softuni.invoice.model.view;
 
-import bg.softuni.invoice.model.base.UserBaseModel;
-
-import java.util.HashSet;
 import java.util.Set;
 
-public class UserViewModel extends UserBaseModel {
+public class UserViewModel {
+
+    private String id;
+    private String username;
+    private String firstName;
+    private String lastName;
+    private Set<String> authorities;
+    private boolean enabled;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 
-    private Set<String> authorities = new HashSet<>();
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
 
     public Set<String> getAuthorities() {
         return authorities;
@@ -16,4 +50,12 @@ public Set<String> getAuthorities() {
     public void setAuthorities(Set<String> authorities) {
         this.authorities = authorities;
     }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
 }
diff --git a/src/test/java/bg/softuni/invoice/model/view/UserViewModelTest.java b/src/test/java/bg/softuni/invoice/model/view/UserViewModelTest.java
index c9ea25b..ada12cb 100644
--- a/src/test/java/bg/softuni/invoice/model/view/UserViewModelTest.java
+++ b/src/test/java/bg/softuni/invoice/model/view/UserViewModelTest.java
@@ -7,7 +7,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -153,13 +152,12 @@ void authorities_withValidValue_shouldReturnCorrectAuthorities() {
     }
 
     @Test
-    void authorities_whenNotSet_shouldReturnEmptyCollection() {
+    void authorities_whenNotSet_shouldReturnNull() {
         UserViewModel userViewModel = new UserViewModel();
 
         Set<String> actualAuthorities = userViewModel.getAuthorities();
 
-        assertNotNull(actualAuthorities);
-        assertTrue(actualAuthorities.isEmpty());
+        assertNull(actualAuthorities);
     }
 
     @Test