Updated server_wrapper