Replaced hand written parser with generated one