adding preliminary etcd support