Singletons improvement