Addition of kvstore