Add tag marker parsing