Small update about singletons