Improve parsing flexibility