add v21 support