diff --git a/pom.xml b/pom.xml
index 0ebcbfb..7064d98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,11 +28,6 @@
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java
index d378b87..9012daa 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java
@@ -3,14 +3,14 @@ package com.mirna.hospitalmanagementapi.domain.entities;
 import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
 
 import jakarta.persistence.Embeddable;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
 
 @Embeddable
-@NoArgsConstructor
-@AllArgsConstructor
 public class Address {
 
+	public Address() {
+		
+	}
+	
 	public Address(AddressDTO addressDTO) {
 		this.street = addressDTO.street();
 		this.neighborhood = addressDTO.neighborhood();
@@ -28,4 +28,61 @@ public class Address {
 	private String state;
 	private String additionalDetails;
 	private String houseNumber;
+	
+	public String getStreet() {
+		return street;
+	}
+
+	public void setStreet(String street) {
+		this.street = street;
+	}
+
+	public String getNeighborhood() {
+		return neighborhood;
+	}
+
+	public void setNeighborhood(String neighborhood) {
+		this.neighborhood = neighborhood;
+	}
+
+	public String getZipCode() {
+		return zipCode;
+	}
+
+	public void setZipCode(String zipCode) {
+		this.zipCode = zipCode;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	public String getAdditionalDetails() {
+		return additionalDetails;
+	}
+
+	public void setAdditionalDetails(String additionalDetails) {
+		this.additionalDetails = additionalDetails;
+	}
+
+	public String getHouseNumber() {
+		return houseNumber;
+	}
+
+	public void setHouseNumber(String houseNumber) {
+		this.houseNumber = houseNumber;
+	}
+	
 }
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java
index 4e1577a..49faba7 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java
@@ -11,17 +11,9 @@ import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 @Table(name="doctors")
 @Entity(name="Doctor")
-@Getter
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(of="id")
 public class Doctor {
 
 	public Doctor(DoctorDTO doctorDTO) {
@@ -44,5 +36,61 @@ public class Doctor {
 	
 	@Embedded
 	private Address address;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getCrm() {
+		return crm;
+	}
+
+	public void setCrm(String crm) {
+		this.crm = crm;
+	}
+
+	public String getTelephone() {
+		return telephone;
+	}
+
+	public void setTelephone(String telephone) {
+		this.telephone = telephone;
+	}
+
+	public Speciality getSpeciality() {
+		return speciality;
+	}
+
+	public void setSpeciality(Speciality speciality) {
+		this.speciality = speciality;
+	}
+
+	public Address getAddress() {
+		return address;
+	}
+
+	public void setAddress(Address address) {
+		this.address = address;
+	}
 	
 }