Updated order classes