Adapt to new version