Moved to std::array