modify Singleton method etc.

modify Singleton method and config etc.