Update keys, values functions since namespace collisions kill code