Added auto-complete mode