Made EtcdClient methods more reusable