Fix isNotRequired/required on models