Adding DTM support, final piece before tracking