Rebuilt parser