add long keys to all entities