Changed Server to module rather than class