Update to the new body API