Refactor of delivery method in the generator