Add more C++ 11 support