Better way to handle raw responses