Added configuration file and command options