Updates to config generation.