Improve reserved words validation setup