Update singletons handling