Merge "Add more fields in Suggestion model"