Added auto-complete support