Support CLI options