Added BODY support