add auto-complete support