Updated comments to Parser