Added a form builder concept