Added definition support for non-annotated words