Added BST3 Support