Add support for tags.