Modified DM for new Search needs