Updated server with new model