Database and Server are now singletons