improved mapping for order item