Tweaked extraction to ignore response type