Added ability to use delivery description