adjust to refactoring introduction of server