A few more words; add classes to prefixes