Addapt to many changes in FormBuilder