Added JSONForm support