Added word count support