Suggestions support added