Repositories, Mappers, Entities & default fixes