- improve internal array handling