added AIKeychain and other data model changes