Adding support for array fields

Change-Id: I6d3a5d0b71340f81ff7458fca2bd3182e6551a21