Adding support for multidata forms