Added comments to the current parser