Improved parsing model