Added more form elements