Adapted to skysns v2 with etcd