Added support for extra reserved words.