Finish tagging implementation