Code changes for A&AI add/update