Upgrading the MustFormValue model