Fix scope of constructor & desctructor of UnifiedDataStore