Add support for grades