[fr] Follow #1244

3.0 simplify api