New grade system in models and front-end