Add array support