Updates in line with changes in Private.