Refactoring domain model.
Partially refactored mappers.