Collections support

Change-Id: Ic8dbdb45a52c82a4fd2dd5951d98172bf096f2bb