Reduced Boost usage, increased C++ 11 STL usage