Some major code refactoring on the server