Added auto-completion support.