Add the new fields for chunking instead of replacing existing ones

This MR adds the new fields for chunking in a safe way so we can migrate away from the old response. This change makes it backwards compatible