Added Singleton support.