Adding auto-complete mode