Update formBuilder implementation