refactored toplevel singletons to Application scope