refactored command/tags structure