Taking the word types into account