Ai Class minor changes