Added new class, KeyValue.