Added array support