Add tag switching support