Removed need for entity ids in the registry