Convert BTreeMap to new entry API