added simple form support