Adapt to last framework version