More work on BTree