Update the support for C++11