Add support for custom responses