Updated to work with latest d-t-m