Added support for shipping data