Add form builder support