Add command-line tagging support