Updated operator and tag-related stuff.