added support for extra headers for message