moved Singleton to Config