Improve default keywords