updated for new api and dfxml