I think this will be the final(not permanent, just no more plans to change) layout for the XML headers.