Updates for array handling (incomplete).