Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterDetailsDTO.java
===================================================================
--- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterDetailsDTO.java	(revision b2488107b82c95e4bdfdfd18b76b44f023786601)
+++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterDetailsDTO.java	(revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa)
@@ -11,10 +11,8 @@
 @NoArgsConstructor
 public class RecruiterDetailsDTO {
-    private Long id;
-    private String email;
     private String companyName;
     private String companyDescription;
-    private String phoneNumber;
-    private boolean hasAccess;
-    private LocalDateTime registeredOn;
+    private String contactEmail;
+    private String contactPhoneNumber;
+    private String receptionist;
 }
Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/JobSeeker.java
===================================================================
--- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/JobSeeker.java	(revision b2488107b82c95e4bdfdfd18b76b44f023786601)
+++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/JobSeeker.java	(revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa)
@@ -8,4 +8,6 @@
 import lombok.NoArgsConstructor;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.Role;
+
+import java.nio.file.Paths;
 
 @Entity
@@ -22,4 +24,8 @@
         this.lastName = lastName;
         this.phoneNumber = phoneNumber;
+
+        String relativeProfilePicFilePath = Paths.get("uploads", "job-seekers", "profile-pics", "default-profile-pic.png").toString();
+        this.profilePicFilePath = relativeProfilePicFilePath;
+
         this.role = Role.ROLE_JOBSEEKER;
     }
@@ -34,4 +40,6 @@
     private String phoneNumber;
 
+    private String profilePicFilePath;
+
     @Override
     public String getName() {
Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/Recruiter.java
===================================================================
--- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/Recruiter.java	(revision b2488107b82c95e4bdfdfd18b76b44f023786601)
+++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/Recruiter.java	(revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa)
@@ -9,8 +9,9 @@
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.Role;
 
+import java.nio.file.Paths;
+
 @Entity
 @Data
 @NoArgsConstructor
-@AllArgsConstructor
 @Table(name = "recruiters")
 public class Recruiter extends User {
@@ -21,5 +22,10 @@
         this.companyName = companyName;
         this.companyDescription = "";
-        this.phoneNumber = phoneNumber;
+        this.contactEmailAddress = email;
+        this.contactPhoneNumber = phoneNumber;
+        this.receptionist = "";
+
+        String relativeLogoFilePath = Paths.get("uploads", "logo", "default-company-logo.png").toString();
+        this.logoFilePath = relativeLogoFilePath;
         this.role = Role.ROLE_RECRUITER;
     }
@@ -31,6 +37,11 @@
     private String companyDescription;
 
-    @Column(name = "phone_number")
-    private String phoneNumber;
+    private String contactEmailAddress;
+
+    private String contactPhoneNumber;
+
+    private String receptionist;
+
+    private String logoFilePath;
 
     @Override
Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/JobSeekerMapper.java
===================================================================
--- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/JobSeekerMapper.java	(revision b2488107b82c95e4bdfdfd18b76b44f023786601)
+++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/JobSeekerMapper.java	(revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa)
@@ -2,5 +2,8 @@
 
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.JobSeekerDTO;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.JobSeekerEditDetailsDTO;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterEditDetailsDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.JobSeeker;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter;
 
 public class JobSeekerMapper {
@@ -26,3 +29,12 @@
     }
 
+    public static JobSeekerEditDetailsDTO mapToJobSeekerEditDetailsDTO(JobSeeker jobSeeker) {
+        return new JobSeekerEditDetailsDTO(
+                jobSeeker.getEmail(),
+                jobSeeker.getFirstName(),
+                jobSeeker.getLastName(),
+                jobSeeker.getPhoneNumber()
+        );
+    }
+
 }
Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/RecruiterMapper.java
===================================================================
--- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/RecruiterMapper.java	(revision b2488107b82c95e4bdfdfd18b76b44f023786601)
+++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/RecruiterMapper.java	(revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa)
@@ -1,6 +1,8 @@
 package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.mappers;
 
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterAdminDetailsDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterEditDetailsDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter;
 
@@ -12,5 +14,5 @@
                 recruiter.getPassword(),
                 recruiter.getCompanyName(),
-                recruiter.getPhoneNumber()
+                recruiter.getContactPhoneNumber()
         );
     }
@@ -18,9 +20,31 @@
     public static RecruiterDetailsDTO mapToRecruiterDetailsDTO(Recruiter recruiter) {
         return new RecruiterDetailsDTO(
+                recruiter.getCompanyName(),
+                recruiter.getCompanyDescription(),
+                recruiter.getContactEmailAddress(),
+                recruiter.getContactPhoneNumber(),
+                recruiter.getReceptionist()
+        );
+    }
+    public static RecruiterEditDetailsDTO mapToRecruiterEditDetailsDTO(Recruiter recruiter) {
+        return new RecruiterEditDetailsDTO(
+                recruiter.getEmail(),
+                recruiter.getCompanyName(),
+                recruiter.getCompanyDescription(),
+                recruiter.getContactEmailAddress(),
+                recruiter.getContactPhoneNumber(),
+                recruiter.getReceptionist()
+        );
+    }
+
+    public static RecruiterAdminDetailsDTO mapToRecruiterAdminDetailsDTO(Recruiter recruiter) {
+        return new RecruiterAdminDetailsDTO(
                 recruiter.getId(),
                 recruiter.getEmail(),
                 recruiter.getCompanyName(),
                 recruiter.getCompanyDescription(),
-                recruiter.getPhoneNumber(),
+                recruiter.getContactEmailAddress(),
+                recruiter.getContactPhoneNumber(),
+                recruiter.getReceptionist(),
                 recruiter.isHasAccess(),
                 recruiter.getRegisteredOn()
@@ -36,4 +60,5 @@
         );
     }
+
 //    Using MapStruct:
 //    RecruiterMapper INSTANCE = Mappers.getMapper(RecruiterMapper.class);
