Updated OrderManager