Add tagNames support