Updated for pyramid 1.5