Update TSK for DFXML closer to schema