Modified entities and mapping