Added more rules for shipments