Refactored FormBuilder