Follow d-t-m API change (wip)