Update to support teapot 0.6