Some more updates to config file optimization