Improve option order