Update to follow modifications in client lib