Fixed IntelliSense support