Adapt to latest release