Redesigning KeyValue objects to remove all the unnecessary getters and s...

...etters.