Next refactorings