Prep for next version - breaking changes around body formats