Switch to new server implementation