- Removed the direct calls to TextCollection, use XMLTree wrapper instead