Some pre-deployment refactoring for the Server side