Added support for setting tags