Refactor new data delivery for single start point