Added implementation of the message handling
Updated messages headers