Adds more array support