APOLLO-3475 Plugged in intial teams, updated inheritance construction