Improved support for Visual Studio