Updated the config file structure