Migrate to C++11