Added support for tags