Add support for tags as labels