Adding array support