added simple form support to all forms