Add tree field to DataContext and DataQuery

Fix #138