Order and OrderManager updated