Add body and header tools