NEW Add generic checks for fields being enabled/disabled.