Moved to array package