Improve get key-value pair.