Always include whole_body