Update to new API [ci skip]