Changed Singleton to Static