CloudKit enhancements