Improved autocomplete for some classes.