Improved xml data source