Update to use extra forms before adding new ones