Rewrite client response parsing