Removed DTO dependency from Domain objects