FormBuilder refactor - field types classes added