More workings in the refactoring.