added body field handling