Added multiple form support