Add auto-complete config
Refactor