Changed how configuration file is handled