Removed c++11 requirement