Singleton Class Updated