Added new services and rrefactored some DTOs