updated to work with current version of dfxml