I3: Add tagging feature