Modifs to config structure ++