User tagging refactored