Add comments to EventStream