Updated vs14 support