diff --git a/src/main/java/com/mirna/hospitalmanagementapi/application/controllers/DoctorController.java b/src/main/java/com/mirna/hospitalmanagementapi/application/controllers/DoctorController.java
index 5b0149a..7e58193 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/application/controllers/DoctorController.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/application/controllers/DoctorController.java
@@ -1,5 +1,6 @@
 package com.mirna.hospitalmanagementapi.application.controllers;
 
+import java.net.URI;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,6 +8,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.ResponseEntity.BodyBuilder;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -15,11 +17,15 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.util.UriBuilder;
+import org.springframework.web.util.UriComponents;
+import org.springframework.web.util.UriComponentsBuilder;
 
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorPublicDataDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorUpdatedDataDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorPublicDataDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorUpdatedDataDTO;
 import com.mirna.hospitalmanagementapi.domain.entities.Doctor;
+import com.mirna.hospitalmanagementapi.domain.entities.Patient;
 import com.mirna.hospitalmanagementapi.domain.services.DoctorService;
 
 import jakarta.validation.Valid;
@@ -43,7 +49,7 @@ public class DoctorController {
 	 * @param doctorDTO The data transfer object containing data for Doctor
 	 * entity.
 	 * 
-	 * @return A response entity containing the saved doctor if successful, or
+	 * @return A response entity containing the saved doctor and created status if successful, or
 	 * a 400-level error if there is a validation error
 	 */
 	@PostMapping
@@ -51,8 +57,30 @@ public class DoctorController {
 		
 		Doctor doctor = doctorService.addDoctor(doctorDTO);
 		
-		return ResponseEntity.ok(doctor);
+		UriComponents uriComponents = UriComponentsBuilder
+				.fromUriString("/api/v1.0/doctors/{id}") 
+				.encode() 
+				.build(); 
+
+		URI uri = uriComponents.expand(doctor.getId()).toUri();
 		
+		return ResponseEntity.created(uri).body(doctor);
+	}
+	
+	/**
+	 * Get method to receive a Doctor record by the provided ID
+	 *
+	 * @param id A long representing the doctor's unique identifier
+	 * 
+	 * @return A response entity containing the saved doctor if successful, or
+	 * a 404 level error if it is non-existent
+	 */
+	@GetMapping("/{id}")
+	public ResponseEntity<Object> getDoctor(@PathVariable Long id) {
+	
+		Doctor doctor = doctorService.findDoctorById(id);
+		
+		return ResponseEntity.ok(doctor);
 	}
 	
 	/**
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/application/services/DoctorServiceImpl.java b/src/main/java/com/mirna/hospitalmanagementapi/application/services/DoctorServiceImpl.java
index bed95f2..2a7780b 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/application/services/DoctorServiceImpl.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/application/services/DoctorServiceImpl.java
@@ -9,13 +9,15 @@ import com.mirna.hospitalmanagementapi.application.usecase.doctor.SaveDoctorUseC
 import com.mirna.hospitalmanagementapi.application.usecase.doctor.FindDoctorByIdUseCase;
 import com.mirna.hospitalmanagementapi.application.usecase.doctor.FindDoctorsUseCase;
 import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorPublicDataDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorUpdatedDataDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorPublicDataDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorUpdatedDataDTO;
 import com.mirna.hospitalmanagementapi.domain.entities.Address;
 import com.mirna.hospitalmanagementapi.domain.entities.Doctor;
 import com.mirna.hospitalmanagementapi.domain.services.DoctorService;
 
+import jakarta.persistence.EntityNotFoundException;
+
 /**
  * This class is an implementation of the DoctorService interface.
  *
@@ -50,6 +52,23 @@ public class DoctorServiceImpl implements DoctorService {
 		
 		return saveDoctor.execute(doctor);
 	}
+	
+	/**
+	 * Finds a stored doctor by id.
+	 * 
+	 * @param id A long representing the doctor's unique identifier
+	 * @return The corresponding doctor if successful, or throws an
+	 *         EntityNotFoundException if it is non-existent.
+	 * @throws EntityNotFoundException When doctor with id provided is non-existent
+	 */
+	@Override
+	public Doctor findDoctorById(Long id) throws EntityNotFoundException {
+		Doctor doctor = findDoctorById.execute(id);
+		
+		if (doctor == null) throw new EntityNotFoundException();
+		
+		return doctor;
+	}
 
 	/**
 	 * Finds doctors from the database.
@@ -70,10 +89,12 @@ public class DoctorServiceImpl implements DoctorService {
 	 * @return The updated doctor if successful,  or null if there is an error.
 	 */
 	@Override
-	public Doctor updateDoctor(DoctorUpdatedDataDTO doctorUpdatedDataDTO) {
+	public Doctor updateDoctor(DoctorUpdatedDataDTO doctorUpdatedDataDTO) throws EntityNotFoundException {
 		Doctor doctor = findDoctorById.execute(doctorUpdatedDataDTO.id());
 		
-		if (doctor != null) {
+		if (doctor == null) {
+		 throw new EntityNotFoundException();	
+		}
 			
 		if (doctorUpdatedDataDTO.name() != null) {
 			doctor.setName(doctorUpdatedDataDTO.name());
@@ -121,8 +142,6 @@ public class DoctorServiceImpl implements DoctorService {
 		
 		doctor = saveDoctor.execute(doctor);
 		
-		}
-		
 		return doctor;
 		
 	}
@@ -134,16 +153,16 @@ public class DoctorServiceImpl implements DoctorService {
 	 * @return The deactivated doctor if successful, or null if there is an error.
 	 */
 	@Override
-	public Doctor deactivateDoctor(Long id) {
+	public Doctor deactivateDoctor(Long id) throws EntityNotFoundException {
 		Doctor doctor = findDoctorById.execute(id);
-		
-		if (doctor != null) {
-			doctor.setActive(false);
-			
-			return saveDoctor.execute(doctor);
+
+		if (doctor == null) {
+			throw new EntityNotFoundException();
 		}
-		
-		return null;
+			
+		doctor.setActive(false);
+
+		return saveDoctor.execute(doctor);
 	}
 
 }
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/services/DoctorService.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/services/DoctorService.java
index afa3c4c..69fe3ab 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/services/DoctorService.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/services/DoctorService.java
@@ -26,6 +26,15 @@ public interface DoctorService {
 	* @return The saved doctor if successful,  or null if there is an error.
 	*/
     public Doctor addDoctor(DoctorDTO doctorDTO);
+
+	/**
+   	* Finds a stored doctor by id.
+   	* 
+   	* @param id A long representing the doctor's unique identifier
+   	* @return The corresponding doctor if successful, or null if it is non-existent.
+   	*/
+    public Doctor findDoctorById(Long id);
+	
     /**
 	 * Retrieves a paginated sublist of doctors.
 	 *