Update etcd method. Find a hacky solution for the watch issue