Made compatible with VisualStudio