Enhanced with VS best practices