Improved ApiToDomain mappings. Added custom mappings.