Improve config creation