Added support for Arrays