New Key/Value functionality added.