Add support for msvc