Changed how config file is handled