FormBuilder refactor - 1st step