Further changes to BST to implement the new types