Added formData switch to field definitions