[DNM] Refactor UG deliveries