Added company and class year