Refactoring: moving calls to all wheels to delegate function