Adding bunch_major option to dataset token wrapper