DB: maker methods now return BTreeMap instead of Map