Improvement of the Deliver class