Added support for form encoding