Added variable support for Visual Studio