Changed to eager instantiation in singletons. Moved all initialization
to constructors