Updating aai adapter to v16 model