Added array handling.