Change Options order making XAP 10 New API to be the second