Fix key value store