Still fixing bugs with data driven XML system