Change Singleton class name to Context