Use new form builder