Added config option for etcd