MAPPING assigned and ENTITIES for each entity generated IMPROVED