Server compatibility

Server compatibility