Added support for tag