Updates to support Vs 2013