Updated DTM for better performance