Removing the use of Singletons.