DnD: Update to use dstore's beforeId option