C++17 support

Add C++17 support