Entities and Mappings small changes