Add basic tagging mode