Cosmetic changes

Including new constant for body entities
Added Logging of messages