Updated to support teapot 0.6