adds improved tagging support