Update for the new lib.