Update for Singleton with no copy