Making client work with new server api