Auto-complete support added