Added support for tags.