Improve maven parser