You are right. This is not part of this refactoring.