Improved response parser