Updated based on Visual Studio Code Analysis