Updated the form fields to match new requirements.