Add auto-complete and session support