Added missing form fields