Updated array handling