Update for teapot 0.8.0