Add support for keywords.