Added support for singletons