added skip_field_class switch