Add basic tagging support.