Changes related to Refactoring.