Updates for Visual Studio