Changes related to refactoring