Changes to plumbing in preparation for dmsearch