Added preliminary support for collection properties in the ComponentMap