added new controls extra_fields and numeric_fields