Added keyword checking.