Updates to Singleton class