More enhancements courtesy of c++11