Restore Server to be more like the MongoDB driver