Update for std::io removal