Redesigning datasource to work with simplified XMLu.