Added partially tagging