Added support for configuration file