Add FXForm support