Refactored how raw responses are handled.