Improve parsing