Changes related to --ai option