Updated client, fixed etcd check