Removed the need for c++11