C++11 version of Diana