- Server refactoring