Make subdocument divider more flexible