Improved Parser System