Added form builder and form swig tag