Added User tag functionality