Add suggest support