Add remove tag support