Preparing for DM overhaul