Final commit for single-node kvstore