Improve default data diversity