Adding VS support