Server refactoring.