VS Enhancements