removed all references to DTOs from the domain model