[REFACTOR] Re-ordered override options