Changes to support checkout and confirmation pages