Added support for words