Updated WordCounter