Add array support (still need some work)