Refactoring to avoid maintenance after CR