Added option to use etcd