Next implementation step of prepared refactorings