added support for pickup and freight pickup