Added full support for saving the year, little enhancement for the grades_table