Updated Order and OrderItem Entities