Added auto suggestor support