Adapt to 5.0