Updates for visual studio