Changed to use modified version of singletons