Improve parsing dependencies