Added support for config file