Eliminating the use of Singletons.