Updated OrderList class