Adding code for docrep and tagging