Improving DND support