Fixed mapping of entities