phpdocs fix and Group model fix