Better order item create/update