Add SingleRegistrar and remove anonymous instances