Fix #167: Key-Value storage.