Adding the refactoring changes