Update for c++11