Added form types, everything works