Support arrays

Change-Id: I087f8b63e4218bb3a832f2cff5c4d137ea4baba1