Updated config files according to Diego's comments