Added more form fields