Update to handle new private fields by default.