Improved default config