Improve result parsing