Added ability to set tag