Add SF2 form support