Add better default configuration