Improve default setting