Do the config file management better.