added unique entity ids