Fix teh Singletons to have a global registry