Improve visual studio support