Next step of refactoring