ServicesContainer is now a singleton
Made public previously internal classes