Add auto-complet support