Restructured command option