Migrate BinarySearchTree changes to Dictionary versions