Improved large array support