Add and use Comment model instead of Grade.comment