Started refactoring the message headers in order to consolidate them into a single header