Config generation improvements