FW-219 - Add support for Visual Studio