Suggestion infrastructure added.