* improvements in singletons