Adapt to latest version