Updated suggestions to new data structure.