Move afiClass/safiClass assignment