Need to document this feature and update the spec
Need to document this feature and update the spec