Parser switched to check for keywords vs string matching