Added support for tag name