Added support for vanduo-type nouns