Added support for Tag.