Updated final result parsing