Build batch adapted to new structure