Switch to using body._X classes