Change the server and user wrappers to say handler