Update for C++11