Added order type management