Improve default settings