DXS changes and tree control