Adding support for config files