Refactored ALL Services to singletons