Adopt new API once again