Updated to latest VS build APIs