including grade and refactoring all V2 models