Add scratch-tagging