Add support for team-v2.4