Added support for CollectionValue fields.