Collections support

Change-Id: I2d9d34b8e9e0f62a320b522742e3f2eb8b242449