Modifs to config file structure ++