Added additional fields for delivery