Added some new upstream nouns