Add Transit and custom form-params support