Improve body-def