Add support for Arrays