migrate to command tagging