Add proper support for DTM