Adapt mentions implementation to latest changes in 2.0