Improved array support