More server refactoring.