Marshalling headers reorganized