It would be a miracle to expect that much forethought from Kishimoto.

Hell, if you read the first chapters of the manga, you won't even see the Kiba or Shikamaru's team among Naruto's classmates like you do in the anime. They were basically last-minute additions.