better support for form data