Improve generation of default config