Classified more nouns