Add more form types