Refactoring: server systems.