Sync with SC's changes on body API