Singleton pattern added to Core