More updates to BTree