Some changes, mostly support for optional fields.