Minor changes for getting form data