Added some C++11 magic