Added support for etcd