More changes as part of the refactoring