Tagging before refactoring