The changes for supporting default option