Preparing to support latest release of teapot