Improved forms processing