FormBuilder refactor - new form class