Switch to using _ for body context
Switch to using body._X classes
Merged body._ changes