Improve order/degree handling