FormBuilder refactor - changed method visibility