Remove unused options, and set necessary options as cli options
Update configuration file field name
Support more cli options