Finished reworking the entity registration.