Update for teapot 1.0