Fixed #316: EnrichmentTag class impl