Updated automatic chunk generation