Added support for multiple VS versions