Add support for response type