Made some basic preparations for iCloud support