Adapt to new ArrayFunc