Added support for word-lexicons