Updated to use latest FormConfiguration changes