Update for changes to Data.Array