Added DTOs to Service layer (Bug)