Add support for hyphenated words