More modifications for message handling and property/headers usage.