Return old_key as well as key