Removed two-way mapping, now DTO to Domain is handled explicitly