better data etcd structure