Adding support for shipping drivers