Add support for tag name.