Updated schema (and generators partially) to support item level collection declaration.