Updated OrderList clas