Working on C++11 support