KV file optimisations