Updated config file and headers