updated with DFXML changes