Add enhancing syntax for C++11/14