Added Array support