Modified data model for grade structures