Add support for form field format