Added support for config files