Updated for version 0.6 of teapot.