Improved default settings