Autocompletion improvement!