Improvements on OrderManager