Updated BaseTree for streams