Migration to new Form builder