Updated the Parser syntax tags, parse optimizations