Refactored classes. Added single Body class.