add v4.0 support