We never initialize the dictionary
Updated iCloud logic