[TASK] Use proper mapping for domain model.