Added hyphenator support