Updated compatibility [ci-skip]