Singletons now fully supported