One step further into the refactoring.