Added support for the configuration file