Improved Form handling.