Added partial support for forms