Adjusted changes in accordance with refactoring