- Adapt to 3.1.0 version