Updated order class