Add form field parsing