Added hyphenation support