Update to CMR versions of AAI