Added support for comment tags