Moved building of bodies to a separate module