Changes to Registrar and it's connected classes.