Added Singleton. Minor fixing