Add ability to add tag and user_tag