MOBILE-549 Grades plugin: Added improved grades service