Added a new argument for configuration file and fix issues