In the right way for finishing the engine refactoring.