Adding ClusTree changes for performance testing