Fixed grades parsing to work with more versions