Added additional reponse types and handlers.