more robust iCloud support