Adding support for user tagging.