Add kvstore assignment