Improve genAffectation