Added more keywords
Converted keyword character list to a character class