Changes to C++11