Add body support, but disable it for now