Adjust cli to implement the new server contract.