Added grades classes