Some updates to the spec