Better response handling