Add material on first build and building in VS

Address original pull request feedback