BodyExtensions refactoring