Slight Modifications to Singleton class - added stub