Adding support for tags