add body passing support