Added Singleton requirements in