Some changes on the IntelliSense and Internals Parts