Add array support to output