Changes for Suggestion engine.